diff options
| author | Paul Gilbert | 2017-12-09 12:18:15 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-12-09 12:18:15 -0500 |
| commit | 9c432233a2146de9923defc04b994ff91f971137 (patch) | |
| tree | 0ed189538332947fbce9cc0957f21d491d036e58 | |
| parent | 02606937eb1fd88193c09585997c7159018165d3 (diff) | |
| download | scummvm-rg350-9c432233a2146de9923defc04b994ff91f971137.tar.gz scummvm-rg350-9c432233a2146de9923defc04b994ff91f971137.tar.bz2 scummvm-rg350-9c432233a2146de9923defc04b994ff91f971137.zip | |
XEEN: Change monster _damageType from int to DamageType enum
| -rw-r--r-- | engines/xeen/combat.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/interface_scene.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/map.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 4a952fa79d..866cb8a852 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -762,7 +762,7 @@ void Combat::monsterOvercome() { if (monster._damageType != DT_PHYSICAL && monster._damageType != DT_DRAGONSLEEP) { // Do a saving throw for monster if (dataIndex <= _vm->getRandomNumber(1, dataIndex + 50)) - monster._damageType = 0; + monster._damageType = DT_PHYSICAL; } } } diff --git a/engines/xeen/interface_scene.cpp b/engines/xeen/interface_scene.cpp index c9dd5343df..05815c5d1b 100644 --- a/engines/xeen/interface_scene.cpp +++ b/engines/xeen/interface_scene.cpp @@ -704,7 +704,7 @@ void InterfaceScene::animate3d() { for (uint idx = 0; idx < map._mobData._monsters.size(); ++idx) { MazeMonster &monster = map._mobData._monsters[idx]; - if (!monster._damageType) { + if (monster._damageType == DT_PHYSICAL) { if (monster._frame < 8) { MonsterStruct &monsterData = *monster._monsterData; if (!monsterData._loopAnimation) { diff --git a/engines/xeen/map.h b/engines/xeen/map.h index d0b63ec146..19d7cc56f5 100644 --- a/engines/xeen/map.h +++ b/engines/xeen/map.h @@ -248,7 +248,7 @@ struct MazeMonster { int _id; int _spriteId; bool _isAttacking; - int _damageType; + DamageType _damageType; int _field9; int _fieldA; int _hp; |