diff options
| author | athrxx | 2011-12-12 20:03:35 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:16 +0100 |
| commit | 8716ed1703f55b4c0e33a87cf40b65d06151c641 (patch) | |
| tree | 394c5cf23a16e26447a290224bd69cb6d8a87790 | |
| parent | 0aa32385230dbe1ab62bb2d02d04ca5cc46d928c (diff) | |
| download | scummvm-rg350-8716ed1703f55b4c0e33a87cf40b65d06151c641.tar.gz scummvm-rg350-8716ed1703f55b4c0e33a87cf40b65d06151c641.tar.bz2 scummvm-rg350-8716ed1703f55b4c0e33a87cf40b65d06151c641.zip | |
KYRA: (EOB/LOL) - again fix static resource loading for EOB when LOL is disabled
| -rw-r--r-- | engines/kyra/resource.h | 4 | ||||
| -rw-r--r-- | engines/kyra/staticres.cpp | 17 | ||||
| -rw-r--r-- | engines/kyra/staticres_rpg.cpp | 4 |
3 files changed, 14 insertions, 11 deletions
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index f5d70e084c..30cf17dc1a 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -841,8 +841,8 @@ private: kLoLCompassData = 10, kLoLFlightShpData = 11, kLoLButtonData = 12, - kLoLRawDataBe16 = 13, - kLoLRawDataBe32 = 14, + kRawDataBe16 = 13, + kRawDataBe32 = 14, kEoB2SequenceData = 15, kEoB2ShapeData = 16, diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 888b515fd9..cd49b03b53 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -254,24 +254,27 @@ bool StaticResource::init() { { kLoLSpellData, proc(loadSpellData), proc(freeSpellData) }, { kLoLCompassData, proc(loadCompassData), proc(freeCompassData) }, { kLoLFlightShpData, proc(loadFlyingObjectData), proc(freeFlyingObjectData) }, - { 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) }, +#endif +#if defined(ENABLE_EOB) || defined(ENABLE_LOL) + { kRawDataBe16, proc(loadRawDataBe16), proc(freeRawDataBe16) }, + { kRawDataBe32, proc(loadRawDataBe32), proc(freeRawDataBe32) }, +#endif +#ifdef ENABLE_LOL + { kLoLButtonData, proc(loadButtonDefs), proc(freeButtonDefs) }, +#else { kLoLButtonData, proc(loadDummy), proc(freeDummy) }, -#endif // ENABLE_LOL +#endif #ifdef ENABLE_EOB { kEoB2SequenceData, proc(loadEoB2SeqData), proc(freeEoB2SeqData) }, { kEoB2ShapeData, proc(loadEoB2ShapeData), proc(freeEoB2ShapeData) }, { kEoBNpcData, proc(loadEoBNpcData), proc(freeEoBNpcData) }, -#endif // ENABLE_EOB +#endif { 0, 0, 0 } }; diff --git a/engines/kyra/staticres_rpg.cpp b/engines/kyra/staticres_rpg.cpp index 0dfdb381ed..efee3bed78 100644 --- a/engines/kyra/staticres_rpg.cpp +++ b/engines/kyra/staticres_rpg.cpp @@ -28,11 +28,11 @@ namespace Kyra { #if defined(ENABLE_EOB) || defined(ENABLE_LOL) const uint16 *StaticResource::loadRawDataBe16(int id, int &entries) { - return (const uint16 *)getData(id, kLoLRawDataBe16, entries); + return (const uint16 *)getData(id, kRawDataBe16, entries); } const uint32 *StaticResource::loadRawDataBe32(int id, int &entries) { - return (const uint32 *)getData(id, kLoLRawDataBe32, entries); + return (const uint32 *)getData(id, kRawDataBe32, entries); } bool StaticResource::loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size) { |