diff options
| -rw-r--r-- | engines/xeen/combat.cpp | 4 | ||||
| -rw-r--r-- | engines/xeen/dialogs/dialogs_input.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 21a743b59f..adc7643bf7 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -633,11 +633,11 @@ 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)) { + if (condition == DEPRESSED || condition == CONFUSED || condition == NO_CONDITION) { _vm->_mode = MODE_1; break; } diff --git a/engines/xeen/dialogs/dialogs_input.cpp b/engines/xeen/dialogs/dialogs_input.cpp index 6092fc4f3e..764d772edc 100644 --- a/engines/xeen/dialogs/dialogs_input.cpp +++ b/engines/xeen/dialogs/dialogs_input.cpp @@ -262,7 +262,7 @@ int Choose123::execute(uint numOptions) { result = 0; } else if (_buttonValue >= Common::KEYCODE_1 && _buttonValue < (Common::KEYCODE_1 + (int)numOptions)) { _buttonValue -= Common::KEYCODE_0; - result = (_buttonValue == numOptions) ? 0 : _buttonValue; + result = (_buttonValue == (int)numOptions) ? 0 : _buttonValue; } } |