diff options
| author | Paul Gilbert | 2015-02-16 14:35:23 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2015-02-16 14:35:23 -0500 |
| commit | 30d94950beb02188644dcfd71f3c3a067d0a0c5a (patch) | |
| tree | 98eb5ad9c6f8c17f57b71f263fedb8362e199a82 /engines/xeen/party.cpp | |
| parent | e7ffed76b43471052597bae43afe51c168ded01b (diff) | |
| download | scummvm-rg350-30d94950beb02188644dcfd71f3c3a067d0a0c5a.tar.gz scummvm-rg350-30d94950beb02188644dcfd71f3c3a067d0a0c5a.tar.bz2 scummvm-rg350-30d94950beb02188644dcfd71f3c3a067d0a0c5a.zip | |
XEEN: Starting of combat UI, moved _combatParty into Combat class
Diffstat (limited to 'engines/xeen/party.cpp')
| -rw-r--r-- | engines/xeen/party.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp index 2eb4cc2027..3913ad6a0d 100644 --- a/engines/xeen/party.cpp +++ b/engines/xeen/party.cpp @@ -105,7 +105,6 @@ Party::Party(XeenEngine *vm) { for (int i = 0; i < TOTAL_CHARACTERS; ++i) Common::fill(&_characterFlags[i][0], &_characterFlags[i][24], false); - _combatPartyCount = 0; _partyDead = false; _newDay = false; _isNight = false; @@ -531,10 +530,11 @@ void Party::notEnough(int consumableId, int whereId, bool mode, ErrorWaitType wa } void Party::checkPartyDead() { + Combat &combat = *_vm->_combat; bool inCombat = _vm->_mode == MODE_COMBAT; - for (uint charIdx = 0; charIdx < (inCombat ? _combatParty.size() : _activeParty.size()); ++charIdx) { - Character &c = inCombat ? *_combatParty[charIdx] : _activeParty[charIdx]; + for (uint charIdx = 0; charIdx < (inCombat ? combat._combatParty.size() : _activeParty.size()); ++charIdx) { + Character &c = inCombat ? *combat._combatParty[charIdx] : _activeParty[charIdx]; Condition cond = c.worstCondition(); if (cond <= CONFUSED || cond == NO_CONDITION) { _dead = false; |