[Scummvm-git-logs] scummvm master -> ba6db41a26dc954349c617b2d380fd582d3f65a7

[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:
9c4d3be5e9 XEEN: Bought weapons shouldn't be equipped by default
ba6db41a26 XEEN: Fix Can't Equip message having items in reverse


Commit: 9c4d3be5e9fff480ee44f152c211412b2633ecc8
    https://github.com/scummvm/scummvm/commit/9c4d3be5e9fff480ee44f152c211412b2633ecc8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-16T21:13:35-04:00

Commit Message:
XEEN: Bought weapons shouldn't be equipped by default

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 82eeb9f..ab2269b 100644
--- a/engines/xeen/dialogs/dialogs_items.cpp
+++ b/engines/xeen/dialogs/dialogs_items.cpp
@@ -840,9 +840,12 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite
 						}
 
 						// Add entry to the end of the list
-						XeenItem &bsItem = c._items[category][itemIndex];
-						_oldCharacter->_items[category][INV_ITEMS_TOTAL - 1] = bsItem;
-						bsItem.clear();
+						XeenItem &srcItem = c._items[category][itemIndex];
+						XeenItem &destItem = _oldCharacter->_items[category][INV_ITEMS_TOTAL - 1];
+						destItem = srcItem;
+						destItem._frame = 0;
+
+						srcItem.clear();
 						c._items[category].sort();
 						_oldCharacter->_items[category].sort();
 					}


Commit: ba6db41a26dc954349c617b2d380fd582d3f65a7
    https://github.com/scummvm/scummvm/commit/ba6db41a26dc954349c617b2d380fd582d3f65a7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-16T21:16:42-04:00

Commit Message:
XEEN: Fix Can't Equip message having items in reverse

Changed paths:
    engines/xeen/item.cpp


diff --git a/engines/xeen/item.cpp b/engines/xeen/item.cpp
index 7a4b459..b722d91 100644
--- a/engines/xeen/item.cpp
+++ b/engines/xeen/item.cpp
@@ -215,7 +215,7 @@ void InventoryItems::equipError(int itemIndex1, ItemCategory category1, int item
 		Common::String itemName2 = _character->_items[category2].getName(itemIndex2);
 
 		MessageDialog::show(vm, Common::String::format(Res.REMOVE_X_TO_EQUIP_Y,
-			itemName1.c_str(), itemName2.c_str()));
+			itemName2.c_str(), itemName1.c_str()));
 	} else {
 		MessageDialog::show(vm, Common::String::format(Res.EQUIPPED_ALL_YOU_CAN,
 			(itemIndex1 == -1) ? Res.RING : Res.MEDAL));