diff options
| author | Florian Kagerer | 2009-03-01 14:45:30 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-03-01 14:45:30 +0000 |
| commit | 7ea5cefef4fb1ef9db52cbf5df7f884770113684 (patch) | |
| tree | 7ad307cd465c99268b7adc8a8054467df4e6e581 /engines/kyra/staticres.cpp | |
| parent | 40c4733124a43fb2e921efd07a782ed1688cbc90 (diff) | |
| download | scummvm-rg350-7ea5cefef4fb1ef9db52cbf5df7f884770113684.tar.gz scummvm-rg350-7ea5cefef4fb1ef9db52cbf5df7f884770113684.tar.bz2 scummvm-rg350-7ea5cefef4fb1ef9db52cbf5df7f884770113684.zip | |
LOL: implemented some monster related code (monsters now get placed in the maze, but they still don't do anything)
svn-id: r39039
Diffstat (limited to 'engines/kyra/staticres.cpp')
| -rw-r--r-- | engines/kyra/staticres.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 17f473568b..df14925037 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -44,7 +44,7 @@ namespace Kyra { -#define RESFILE_VERSION 39 +#define RESFILE_VERSION 40 namespace { bool checkKyraDat(Common::SeekableReadStream *file) { @@ -387,6 +387,12 @@ bool StaticResource::init() { //{ lolCharDefsUnk, lolRawDataBe16, "CHUNK.DEF" }, { lolCharDefsAkshel, lolRawDataBe16, "CHAKSHEL.DEF" }, { lolExpRequirements, lolRawDataBe32, "EXPERIENCE.DEF" }, + { lolMonsterModifiers, lolRawDataBe16, "MONSTMOD.DEF" }, + { lolMonsterLevelOffsets, kRawData, "MONSTLVL.DEF" }, + { lolMonsterDirFlags, kRawData, "MONSTDIR.DEF" }, + { lolMonsterScaleY, kRawData, "MONSTZY.DEF" }, + { lolMonsterScaleX, kRawData, "MONSTZX.DEF" }, + { lolMonsterScaleWH, lolRawDataBe16, "MONSTSCL.DEF" }, { lolInventoryDesc, lolRawDataBe16, "INVDESC.DEF" }, { lolLevelShpList, kStringList, "SHPFILES.TXT" }, @@ -1731,6 +1737,12 @@ void LoLEngine::initStaticResource() { _charDefsKieran = _staticres->loadRawDataBe16(lolCharDefsKieran, _charDefsKieranSize); _charDefsAkshel = _staticres->loadRawDataBe16(lolCharDefsAkshel, _charDefsAkshelSize); _expRequirements = (const int32*)_staticres->loadRawDataBe32(lolExpRequirements, _expRequirementsSize); + _monsterModifiers = _staticres->loadRawDataBe16(lolMonsterModifiers, _monsterModifiersSize); + _monsterLevelOffs = (const int8*)_staticres->loadRawData(lolMonsterLevelOffsets, _monsterLevelOffsSize); + _monsterDirFlags = _staticres->loadRawData(lolMonsterDirFlags, _monsterDirFlagsSize); + _monsterScaleX = (const int8*)_staticres->loadRawData(lolMonsterScaleX, _monsterScaleXSize); + _monsterScaleY = (const int8*)_staticres->loadRawData(lolMonsterScaleY, _monsterScaleYSize); + _monsterScaleWH = _staticres->loadRawDataBe16(lolMonsterScaleWH, _monsterScaleWHSize); _inventorySlotDesc = _staticres->loadRawDataBe16(lolInventoryDesc, _inventorySlotDescSize); _levelShpList = _staticres->loadStrings(lolLevelShpList, _levelShpListSize); _levelDatList = _staticres->loadStrings(lolLevelDatList, _levelDatListSize); @@ -1847,8 +1859,8 @@ void LoLEngine::assignButtonCallback(Button *button, int index) { cb(clickedInventorySlot), cb(clickedInventoryScroll), cb(clickedInventoryScroll), - cb(clickedScenePressSwitch), - cb(clickedScenePressSwitch), + cb(clickedWall), + cb(clickedWall), cb(clickedScene), cb(clickedUpArrow), cb(clickedDownArrow), |