libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HADESCH: Remove reliance on zlib by using gzio implementation instead

Browse Source
This commit is contained in:
Vladimir Serbinenko 2022-11-19 01:16:38 +01:00 committed by Filippos Karapetis
parent f540f3ca94
commit 606abe73c8
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/hadesch/hadesch.cpp
View File

@ -31,7 +31,7 @@
#include "common/keyboard.h"
#include "common/macresman.h"
#include "common/util.h"
#include "common/zlib.h"
#include "common/gzio.h"
#include "common/config-manager.h"
#include "engines/advancedDetector.h"
@ -129,8 +129,6 @@ void HadeschEngine::newGame() {
moveToRoom(kWallOfFameRoom);
}
#if defined(USE_ZLIB)
struct WiseFile {
uint start;
uint end;
@ -161,8 +159,8 @@ Common::MemoryReadStream *readWiseFile(Common::File &setupFile, const struct Wis
byte *uncompressedBuffer = new byte[wiseFile.uncompressedLength];
setupFile.seek(wiseFile.start);
setupFile.read(compressedBuffer, wiseFile.end - wiseFile.start - 4);
if (!Common::inflateZlibHeaderless(uncompressedBuffer, wiseFile.uncompressedLength,
compressedBuffer, wiseFile.end - wiseFile.start - 4)) {
if (Common::GzioReadStream::deflateDecompress(uncompressedBuffer, wiseFile.uncompressedLength,
compressedBuffer, wiseFile.end - wiseFile.start - 4) != wiseFile.uncompressedLength) {
debug("wise inflate failed");
delete[] compressedBuffer;
delete[] uncompressedBuffer;
@ -172,7 +170,6 @@ Common::MemoryReadStream *readWiseFile(Common::File &setupFile, const struct Wis
delete[] compressedBuffer;
return new Common::MemoryReadStream(uncompressedBuffer, wiseFile.uncompressedLength);
}
#endif
Common::ErrorCode HadeschEngine::loadWindowsCursors(const Common::ScopedPtr<Common::PEResources>& exe) {
for (unsigned i = 0; i < ARRAYSIZE(cursorids); i++) {
@ -231,7 +228,6 @@ Common::ErrorCode HadeschEngine::loadCursors() {
return Common::kNoError;
}
#if defined(USE_ZLIB)
Common::File setupFile;
if (setupFile.open("Setup.exe")) {
uint len = setupFile.size();
@ -260,7 +256,6 @@ Common::ErrorCode HadeschEngine::loadCursors() {
}
}
}
#endif
debug("Cannot open hadesch.exe");
return Common::kUnsupportedGameidError;