XEEN: Fix changing selected character with mouse in various dialogs

scummvm · Feb 12, 2015 · a39b0b2 · a39b0b2
1 parent 6548dd0
commit a39b0b2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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);
 }
 
 /**