diff options
| author | Paul Gilbert | 2015-02-07 21:17:31 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2015-02-07 21:17:31 -0500 |
| commit | d6e760552e785e466b5d2088570baa182d42ccd0 (patch) | |
| tree | b4abd925ab7bee2a1989da75a9d5c8fe32c02342 /engines/xeen/dialogs_items.cpp | |
| parent | 65ecc9b72138f2dcef0ccf3765363559649b77a2 (diff) | |
| download | scummvm-rg350-d6e760552e785e466b5d2088570baa182d42ccd0.tar.gz scummvm-rg350-d6e760552e785e466b5d2088570baa182d42ccd0.tar.bz2 scummvm-rg350-d6e760552e785e466b5d2088570baa182d42ccd0.zip | |
XEEN: Implemented resting
Diffstat (limited to 'engines/xeen/dialogs_items.cpp')
| -rw-r--r-- | engines/xeen/dialogs_items.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp index 83e0dd23a0..002a8fb946 100644 --- a/engines/xeen/dialogs_items.cpp +++ b/engines/xeen/dialogs_items.cpp @@ -336,11 +336,11 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) { && party._mazeId != 0) { _buttonValue -= Common::KEYCODE_F1; - if (_buttonValue < (int)(_vm->_mode == MODE_InCombat ? + if (_buttonValue < (int)(_vm->_mode == MODE_COMBAT ? party._combatParty.size() : party._activeParty.size())) { // Character number is valid redrawFlag = REDRAW_TEXT; - Character *newChar = _vm->_mode == MODE_InCombat ? + Character *newChar = _vm->_mode == MODE_COMBAT ? party._combatParty[_buttonValue] : &party._activeParty[_buttonValue]; if (mode == ITEMMODE_BLACKSMITH) { @@ -867,7 +867,7 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite Condition condition = c.worstCondition(); switch (condition) { - case SLEEP: + case ASLEEP: case PARALYZED: case UNCONSCIOUS: case DEAD: |