libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

KYRA: (EOB/LOL) - again fix static resource loading for EOB when LOL is disabled

Browse Source
This commit is contained in:
athrxx 2011-12-12 20:03:35 +01:00 committed by Johannes Schickel
parent 0aa3238523
commit 8716ed1703
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/kyra/resource.h
View File

@ -841,8 +841,8 @@ private:
kLoLCompassData = 10,
kLoLFlightShpData = 11,
kLoLButtonData = 12,
kLoLRawDataBe16 = 13,
kLoLRawDataBe32 = 14,
kRawDataBe16 = 13,
kRawDataBe32 = 14,
kEoB2SequenceData = 15,
kEoB2ShapeData = 16,

17
engines/kyra/staticres.cpp
View File

@ -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 }
};

4
engines/kyra/staticres_rpg.cpp
View File

@ -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) {