diff options
| author | athrxx | 2011-12-03 18:28:09 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:16 +0100 |
| commit | 6c8fb30cbd80660bc3882ca0c0895dec8cbc4108 (patch) | |
| tree | fbd2f5d3eb8d3775706d7dc122f7234e321bd445 | |
| parent | 8b618e46df21d90a1a5ad62633a2b9d3c1da0317 (diff) | |
| download | scummvm-rg350-6c8fb30cbd80660bc3882ca0c0895dec8cbc4108.tar.gz scummvm-rg350-6c8fb30cbd80660bc3882ca0c0895dec8cbc4108.tar.bz2 scummvm-rg350-6c8fb30cbd80660bc3882ca0c0895dec8cbc4108.zip | |
KYRA: (EOB) - fix static resource loading for EOB when LOL is disabled
| -rw-r--r-- | engines/kyra/resource.h | 2 | ||||
| -rw-r--r-- | engines/kyra/staticres.cpp | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 8edfd0a174..413bc4572f 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -773,6 +773,7 @@ private: const FileType *getFiletype(int type); const void *getData(int id, int requesttype, int &size); + bool loadDummy(Common::SeekableReadStream &stream, void *&ptr, int &size); bool loadStringTable(Common::SeekableReadStream &stream, void *&ptr, int &size); bool loadRawData(Common::SeekableReadStream &stream, void *&ptr, int &size); bool loadShapeTable(Common::SeekableReadStream &stream, void *&ptr, int &size); @@ -798,6 +799,7 @@ private: bool loadEobNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size); #endif // ENABLE_EOB + void freeDummy(void *&ptr, int &size); void freeRawData(void *&ptr, int &size); void freeStringTable(void *&ptr, int &size); void freeShapeTable(void *&ptr, int &size); diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index c169a397bb..092a4cc1e9 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -257,6 +257,14 @@ bool StaticResource::init() { { kLolRawDataBe16, proc(loadRawDataBe16), proc(freeRawDataBe16) }, { kLolRawDataBe32, proc(loadRawDataBe32), proc(freeRawDataBe32) }, { kLolButtonData, proc(loadButtonDefs), proc(freeButtonDefs) }, +#else + { kLolCharData, proc(loadDummy), proc(freeDummy) }, + { kLolSpellData, proc(loadDummy), proc(freeDummy) }, + { kLolCompassData, proc(loadDummy), proc(freeDummy) }, + { kLolFlightShpData, proc(loadDummy), proc(freeDummy) }, + { kLolRawDataBe16, proc(loadDummy), proc(freeDummy) }, + { kLolRawDataBe32, proc(loadDummy), proc(freeDummy) }, + { kLolButtonData, proc(loadDummy), proc(freeDummy) }, #endif // ENABLE_LOL #ifdef ENABLE_EOB @@ -411,6 +419,10 @@ const void *StaticResource::getData(int id, int requesttype, int &size) { return 0; } +bool StaticResource::loadDummy(Common::SeekableReadStream &stream, void *&ptr, int &size) { + return true; +} + bool StaticResource::loadStringTable(Common::SeekableReadStream &stream, void *&ptr, int &size) { uint32 count = stream.readUint32BE(); size = count; @@ -615,6 +627,9 @@ bool StaticResource::loadShapeAnimData_v2(Common::SeekableReadStream &stream, vo return true; } +void StaticResource::freeDummy(void *&ptr, int &size) { +} + void StaticResource::freeRawData(void *&ptr, int &size) { uint8 *data = (uint8 *)ptr; delete[] data; |