[Scummvm-git-logs] scummvm branch-2-5 -> 52afe036073d379da2c7176d29dc50bc8963cae9

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3db56999e0 XEEN: fix "backpack is full" dialog string
52afe03607 XEEN: fix possible crash in exchange dialog


Commit: 3db56999e0de26e12ceb0830b6a78ca19bce5098
    https://github.com/scummvm/scummvm/commit/3db56999e0de26e12ceb0830b6a78ca19bce5098
Author: Benoit Pierre (benoit.pierre at gmail.com)
Date: 2021-11-16T20:03:31-08:00

Commit Message:
XEEN: fix "backpack is full" dialog string

Use the destination character's name.

Changed paths:
    engines/xeen/dialogs/dialogs_items.cpp


diff --git a/engines/xeen/dialogs/dialogs_items.cpp b/engines/xeen/dialogs/dialogs_items.cpp
index 95aaf14a6b..3dce22abb0 100644
--- a/engines/xeen/dialogs/dialogs_items.cpp
+++ b/engines/xeen/dialogs/dialogs_items.cpp
@@ -327,7 +327,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 							ErrorScroll::show(_vm, Res.CANNOT_REMOVE_CURSED_ITEM);
 						else if (destItems.isFull())
 							ErrorScroll::show(_vm, Common::String::format(
-													   Res.CATEGORY_BACKPACK_IS_FULL[category], c->_name.c_str()));
+													   Res.CATEGORY_BACKPACK_IS_FULL[category], newChar->_name.c_str()));
 						else {
 							XeenItem &destItem = destItems[INV_ITEMS_TOTAL - 1];
 							destItem = srcItem;


Commit: 52afe036073d379da2c7176d29dc50bc8963cae9
    https://github.com/scummvm/scummvm/commit/52afe036073d379da2c7176d29dc50bc8963cae9
Author: Benoit Pierre (benoit.pierre at gmail.com)
Date: 2021-11-16T20:05:43-08:00

Commit Message:
XEEN: fix possible crash in exchange dialog

Don't try to exchange a character with themself...

Changed paths:
    engines/xeen/dialogs/dialogs_exchange.cpp


diff --git a/engines/xeen/dialogs/dialogs_exchange.cpp b/engines/xeen/dialogs/dialogs_exchange.cpp
index 87dde1b0c3..789e3a7b83 100644
--- a/engines/xeen/dialogs/dialogs_exchange.cpp
+++ b/engines/xeen/dialogs/dialogs_exchange.cpp
@@ -51,7 +51,7 @@ void ExchangeDialog::execute(Character *&c, int &charIndex) {
 
 		if (_buttonValue >= Common::KEYCODE_F1 && _buttonValue <= Common::KEYCODE_F6) {
 			_buttonValue -= Common::KEYCODE_F1;
-			if (_buttonValue < (int)party._activeParty.size()) {
+			if (_buttonValue < (int)party._activeParty.size() && _buttonValue != charIndex) {
 				SWAP(party._activeParty[charIndex], party._activeParty[_buttonValue]);
 
 				charIndex = _buttonValue;