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/dialogs_items.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/dialogs_items.cpp')
| -rw-r--r-- | engines/xeen/dialogs_items.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp index 29ec4c684b..ec82afbbd2 100644 --- a/engines/xeen/dialogs_items.cpp +++ b/engines/xeen/dialogs_items.cpp @@ -37,6 +37,7 @@ Character *ItemsDialog::show(XeenEngine *vm, Character *c, ItemsMode mode) { } Character *ItemsDialog::execute(Character *c, ItemsMode mode) { + Combat &combat = *_vm->_combat; EventsManager &events = *_vm->_events; Interface &intf = *_vm->_interface; Party &party = *_vm->_party; @@ -337,11 +338,11 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) { _buttonValue -= Common::KEYCODE_F1; if (_buttonValue < (int)(_vm->_mode == MODE_COMBAT ? - party._combatParty.size() : party._activeParty.size())) { + combat._combatParty.size() : party._activeParty.size())) { // Character number is valid redrawFlag = REDRAW_TEXT; Character *newChar = _vm->_mode == MODE_COMBAT ? - party._combatParty[_buttonValue] : &party._activeParty[_buttonValue]; + combat._combatParty[_buttonValue] : &party._activeParty[_buttonValue]; if (mode == ITEMMODE_BLACKSMITH) { _oldCharacter = newChar; |