aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/combat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/xeen/combat.cpp')
-rw-r--r--engines/xeen/combat.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 21a743b59f..f3baca77a4 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -633,12 +633,12 @@ void Combat::monstersAttack() {
_monstersAttacking = false;
- if (_vm->_mode != MODE_SLEEPING) {
+ if (_vm->_mode == MODE_SLEEPING) {
for (uint charNum = 0; charNum < party._activeParty.size(); ++charNum) {
Condition condition = party._activeParty[charNum].worstCondition();
- if (condition != ASLEEP && (condition < PARALYZED || condition == NO_CONDITION)) {
- _vm->_mode = MODE_1;
+ if (condition == DEPRESSED || condition == CONFUSED || condition == NO_CONDITION) {
+ _vm->_mode = MODE_INTERACTIVE;
break;
}
}
@@ -890,7 +890,7 @@ void Combat::doMonsterTurn(int monsterId) {
if (ableChars.size() == 0) {
party._dead = true;
- _vm->_mode = MODE_1;
+ _vm->_mode = MODE_INTERACTIVE;
return;
}
@@ -2095,7 +2095,7 @@ void Combat::reset() {
clearShooting();
setupCombatParty();
- _combatMode = COMBATMODE_1;
+ _combatMode = COMBATMODE_INTERACTIVE;
_monster2Attack = -1;
}