[Scummvm-git-logs] scummvm master -> 577f19373e37bbe0c291775d35098cd04f6b0c68

[dreammaster]

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

Summary:
577f19373e XEEN: Fix placement of buttons & glyphs in Items dialog


Commit: 577f19373e37bbe0c291775d35098cd04f6b0c68
    https://github.com/scummvm/scummvm/commit/577f19373e37bbe0c291775d35098cd04f6b0c68
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-23T13:13:10-05:00

Commit Message:
XEEN: Fix placement of buttons & glyphs in Items dialog

Changed paths:
    engines/xeen/dialogs_items.cpp


diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp
index 4adab68..6136165 100644
--- a/engines/xeen/dialogs_items.cpp
+++ b/engines/xeen/dialogs_items.cpp
@@ -66,7 +66,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 		if (redrawFlag == REDRAW_FULL) {
 			if ((mode != ITEMMODE_CHAR_INFO || category != CATEGORY_MISC) && mode != ITEMMODE_ENCHANT
 					&& mode != ITEMMODE_RECHARGE && mode != ITEMMODE_TO_GOLD) {
-				_buttons[8]._bounds.moveTo(148, _buttons[8]._bounds.top);
+				_buttons[4]._bounds.moveTo(148, _buttons[4]._bounds.top);
 				_buttons[9]._draw = false;
 			} else if (mode == ITEMMODE_RECHARGE) {
 				_buttons[4]._value = Common::KEYCODE_r;
@@ -75,7 +75,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 			} else if (mode == ITEMMODE_TO_GOLD) {
 				_buttons[4]._value = Common::KEYCODE_g;
 			} else {
-				_buttons[8]._bounds.moveTo(0, _buttons[8]._bounds.top);
+				_buttons[4]._bounds.moveTo(0, _buttons[4]._bounds.top);
 				_buttons[9]._draw = true;
 				_buttons[9]._value = Common::KEYCODE_u;
 			}
@@ -85,7 +85,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 			if (mode != ITEMMODE_CHAR_INFO && mode != ITEMMODE_8 && mode != ITEMMODE_ENCHANT
 					&& mode != ITEMMODE_RECHARGE && mode != ITEMMODE_TO_GOLD) {
 				msg = Common::String::format(Res.ITEMS_DIALOG_TEXT1,
-					Res.BTN_SELL, Res.BTN_IDENTIFY, Res.BTN_FIX);
+					Res.BTN_BUY, Res.BTN_SELL, Res.BTN_IDENTIFY, Res.BTN_FIX);
 			} else if (mode != ITEMMODE_ENCHANT  && mode != ITEMMODE_RECHARGE && mode != ITEMMODE_TO_GOLD) {
 				msg = Common::String::format(Res.ITEMS_DIALOG_TEXT1,
 					category == 3 ? Res.BTN_USE : Res.BTN_EQUIP,
@@ -135,7 +135,8 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 			}
 
 			for (int idx = 0; idx < 9; ++idx) {
-				_itemsDrawList[idx]._y = 10 + idx * 9;
+				_itemsDrawList[idx]._x = 8;
+				_itemsDrawList[idx]._y = 18 + idx * 9;
 
 				switch (category) {
 				case CATEGORY_WEAPON: