amacocian/gMod
1
0
Fork 0
mirror of https://github.com/gwdevhub/gMod.git synced 2026-07-24 20:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to gMod_XorStream when calculating stream length

Browse Source
This commit is contained in:
amacocian
2023-11-16 17:43:38 +01:00
parent 75a5427287
commit a426df194a
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gMod_FileLoader.cpp
+8 -3
View File
@@ -1,3 +1,4 @@
#include <uMod_Main.h>
#include <filesystem>
#include "gMod_FileLoader.h"
#include "gMod_XorStream.h"
@@ -31,9 +32,13 @@ std::vector<TpfEntry> gMod_FileLoader::GetTpfContents()
std::vector<TpfEntry> entries;
try {
auto istream = std::ifstream(file_name, std::ios::binary);
const auto xorstream = gMod_XorStream(istream);
// todo from xorstream
libzippp::ZipArchive zipArchive(file_name, ENCODED_PASSWORD);
auto xorstream = gMod_XorStream(istream);
const std::string password(TPF_PASSWORD.begin(), TPF_PASSWORD.end());
libzippp::ZipArchive zipArchive(file_name, password);
zipArchive.setErrorHandlerCallback([](const std::string& message, const std::string& strerror, int zip_error_code, int system_error_code) -> void {
Message("GetTpfContents: %s %s %d %d\n", message.c_str(), strerror.c_str(), zip_error_code, system_error_code);
});
zipArchive.open();
LoadEntries(zipArchive, entries);
}