diff options
| author | Paul Gilbert | 2015-02-11 21:09:07 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2015-02-11 21:09:07 -0500 |
| commit | a39b0b24a1dccec3e91f45deb047fa027372d84f (patch) | |
| tree | 4e6f62a143e65fce3ed48b7367940edfed5458ba /engines | |
| parent | 6548dd05e316588bde3eae5db10793f8c6effd7b (diff) | |
| download | scummvm-rg350-a39b0b24a1dccec3e91f45deb047fa027372d84f.tar.gz scummvm-rg350-a39b0b24a1dccec3e91f45deb047fa027372d84f.tar.bz2 scummvm-rg350-a39b0b24a1dccec3e91f45deb047fa027372d84f.zip | |
XEEN: Fix changing selected character with mouse in various dialogs
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/dialogs.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/dialogs_char_info.cpp | 1 | ||||
| -rw-r--r-- | engines/xeen/dialogs_items.cpp | 1 | ||||
| -rw-r--r-- | engines/xeen/interface.cpp | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/engines/xeen/dialogs.cpp b/engines/xeen/dialogs.cpp index 33eda14414..a2535fdf02 100644 --- a/engines/xeen/dialogs.cpp +++ b/engines/xeen/dialogs.cpp @@ -54,7 +54,7 @@ void ButtonContainer::addButton(const Common::Rect &bounds, int val, SpriteResou void ButtonContainer::addPartyButtons(XeenEngine *vm) { Party &party = *vm->_party; - for (uint idx = 0; idx < party._activeParty.size(); ++idx) { + for (uint idx = 0; idx < MAX_ACTIVE_PARTY; ++idx) { addButton(Common::Rect(CHAR_FACES_X[idx], 150, CHAR_FACES_X[idx] + 32, 182), Common::KEYCODE_F1 + idx, nullptr, false); } diff --git a/engines/xeen/dialogs_char_info.cpp b/engines/xeen/dialogs_char_info.cpp index de16e9559e..df4b699a72 100644 --- a/engines/xeen/dialogs_char_info.cpp +++ b/engines/xeen/dialogs_char_info.cpp @@ -274,6 +274,7 @@ void CharacterInfo::addButtons() { addButton(Common::Rect(285, 43, 309, 63), Common::KEYCODE_q, &_iconSprites); addButton(Common::Rect(285, 75, 309, 95), Common::KEYCODE_e, &_iconSprites); addButton(Common::Rect(285, 107, 309, 127), Common::KEYCODE_ESCAPE, &_iconSprites); + addPartyButtons(_vm); } /** diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp index 7b4e23eb01..d37d124a7c 100644 --- a/engines/xeen/dialogs_items.cpp +++ b/engines/xeen/dialogs_items.cpp @@ -557,6 +557,7 @@ void ItemsDialog::loadButtons(ItemsMode mode, Character *&c) { addButton(Common::Rect(8, 74, 263, 82), Common::KEYCODE_7, &_iconSprites, false); addButton(Common::Rect(8, 83, 263, 91), Common::KEYCODE_8, &_iconSprites, false); addButton(Common::Rect(8, 92, 263, 100), Common::KEYCODE_9, &_iconSprites, false); + addPartyButtons(_vm); } if (mode == ITEMMODE_BLACKSMITH) { diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp index b8e6437f2a..0916abe26c 100644 --- a/engines/xeen/interface.cpp +++ b/engines/xeen/interface.cpp @@ -219,6 +219,7 @@ void Interface::setMainButtons() { addButton(Common::Rect(239, 27, 312, 37), Common::KEYCODE_1, &_iconSprites, false); addButton(Common::Rect(239, 37, 312, 47), Common::KEYCODE_2, &_iconSprites, false); addButton(Common::Rect(239, 47, 312, 57), Common::KEYCODE_3, &_iconSprites, false); + addPartyButtons(_vm); } /** |