diff options
| author | Paul Gilbert | 2015-02-22 23:45:11 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2015-02-22 23:45:11 -0500 |
| commit | 9725fc57252b6dd4529e5f8e45519ac6fc480a12 (patch) | |
| tree | 272310684a1df58d1b101bb34c0ebfdf792c2273 /engines/xeen/combat.cpp | |
| parent | ddf71710016baaf9989c10b79e5e313464adbdf9 (diff) | |
| download | scummvm-rg350-9725fc57252b6dd4529e5f8e45519ac6fc480a12.tar.gz scummvm-rg350-9725fc57252b6dd4529e5f8e45519ac6fc480a12.tar.bz2 scummvm-rg350-9725fc57252b6dd4529e5f8e45519ac6fc480a12.zip | |
XEEN: Renaming and move flags used for UI indicators
Diffstat (limited to 'engines/xeen/combat.cpp')
| -rw-r--r-- | engines/xeen/combat.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 471fefd751..254c33fa0c 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -123,6 +123,8 @@ Combat::Combat(XeenEngine *vm): _vm(vm), _missVoc("miss.voc"), _pow1Voc("pow1.vo _attackWeapon = nullptr; _attackWeaponId = 0; _hitChanceBonus = 0; + _dangerPresent = false; + _moveMonsters = false; } void Combat::clear() { @@ -437,7 +439,7 @@ void Combat::moveMonsters() { Map &map = *_vm->_map; Party &party = *_vm->_party; - if (!_vm->_moveMonsters) + if (!_moveMonsters) return; intf._tillMove = 0; @@ -448,7 +450,7 @@ void Combat::moveMonsters() { Common::fill(&_monsterMoved[0], &_monsterMoved[MAX_NUM_MONSTERS], false); Common::fill(&_rangeAttacking[0], &_rangeAttacking[MAX_NUM_MONSTERS], false); Common::fill(&_gmonHit[0], &_gmonHit[36], -1); - _vm->_dangerSenseAllowed = false; + _dangerPresent = false; for (uint idx = 0; idx < map._mobData._monsters.size(); ++idx) { MazeMonster &monster = map._mobData._monsters[idx]; @@ -469,7 +471,7 @@ void Combat::moveMonsters() { MonsterStruct &monsterData = map._monsterData[monster._spriteId]; if (pt == monster._position) { - _vm->_dangerSenseAllowed = true; + _dangerPresent = true; if ((monster._isAttacking || _vm->_mode == MODE_SLEEPING) && !_monsterMoved[idx]) { if (party._mazePosition.x == pt.x || party._mazePosition.y == pt.y) { @@ -704,7 +706,7 @@ void Combat::moveMonster(int monsterId, const Common::Point &pt) { Map &map = *_vm->_map; MazeMonster &monster = map._mobData._monsters[monsterId]; - if (_monsterMap[pt.y][pt.x] < 3 && !monster._damageType && _vm->_moveMonsters) { + if (_monsterMap[pt.y][pt.x] < 3 && !monster._damageType && _moveMonsters) { ++_monsterMap[pt.y][pt.x]; --_monsterMap[monster._position.y][monster._position.x]; monster._position = pt; |