diff options
| -rw-r--r-- | engines/xeen/map.h | 2 | ||||
| -rw-r--r-- | engines/xeen/scripts.cpp | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/engines/xeen/map.h b/engines/xeen/map.h index 1bb3cf288c..1c00e549c3 100644 --- a/engines/xeen/map.h +++ b/engines/xeen/map.h @@ -322,7 +322,6 @@ public: }; private: XeenEngine *_vm; - Common::Array<SpriteResourceEntry> _objectSprites; Common::Array<SpriteResourceEntry> _monsterSprites; Common::Array<SpriteResourceEntry> _monsterAttackSprites; Common::Array<SpriteResourceEntry> _wallItemSprites; @@ -330,6 +329,7 @@ public: Common::Array<MazeObject> _objects; Common::Array<MazeMonster> _monsters; Common::Array<MazeWallItem> _wallItems; + Common::Array<SpriteResourceEntry> _objectSprites; public: MonsterObjectData(XeenEngine *vm); diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp index 66e9013cda..bc0b179d4c 100644 --- a/engines/xeen/scripts.cpp +++ b/engines/xeen/scripts.cpp @@ -216,20 +216,23 @@ int Scripts::checkEvents() { MazeObject &selectedObj = map._mobData._objects[intf._objNumber]; if (selectedObj._spriteId == (ccNum ? 15 : 16)) { - for (int idx = 0; idx < MIN((int)map._mobData._objects.size(), 16); ++idx) { - MazeObject &obj = map._mobData._objects[idx]; - if (obj._spriteId == (ccNum ? 62 : 57)) { + // Treasure chests that were opened will be set to be in an open, empty state + for (uint idx = 0; idx < map._mobData._objectSprites.size(); ++idx) { + MonsterObjectData::SpriteResourceEntry &e = map._mobData._objectSprites[idx]; + if (e._spriteId == (ccNum ? 57 : 62)) { selectedObj._id = idx; - selectedObj._spriteId = ccNum ? 62 : 57; + selectedObj._spriteId = ccNum ? 57 : 62; + selectedObj._sprites = &e._sprites; break; } } } else if (selectedObj._spriteId == 73) { - for (int idx = 0; idx < MIN((int)map._mobData._objects.size(), 16); ++idx) { - MazeObject &obj = map._mobData._objects[idx]; - if (obj._spriteId == 119) { + for (uint idx = 0; idx < map._mobData._objectSprites.size(); ++idx) { + MonsterObjectData::SpriteResourceEntry &e = map._mobData._objectSprites[idx]; + if (e._spriteId == 119) { selectedObj._id = idx; selectedObj._spriteId = 119; + selectedObj._sprites = &e._sprites; break; } } |