[Scummvm-git-logs] scummvm master -> 6f3e8ed396078ff40eafbf1cbc94e5f33d87c0ad

[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:
6f3e8ed396 XEEN: Fix rendering of Blacksmith screen


Commit: 6f3e8ed396078ff40eafbf1cbc94e5f33d87c0ad
    https://github.com/scummvm/scummvm/commit/6f3e8ed396078ff40eafbf1cbc94e5f33d87c0ad
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-23T09:25:00-05:00

Commit Message:
XEEN: Fix rendering of Blacksmith screen

Changed paths:
    engines/xeen/town.cpp


diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp
index 10a295c..75b7581 100644
--- a/engines/xeen/town.cpp
+++ b/engines/xeen/town.cpp
@@ -108,7 +108,7 @@ int Town::townAction(int actionId) {
 	case 1:
 		// Blacksmith
 		_icons1.load("esc.icn");
-		addButton(Common::Rect(261, 100, 285, 120), Common::KEYCODE_ESCAPE, &_icons1);
+		addButton(Common::Rect(261, 108, 285, 128), Common::KEYCODE_ESCAPE, &_icons1);
 		addButton(Common::Rect(234, 54, 308, 62), 0);
 		addButton(Common::Rect(234, 64, 308, 72), Common::KEYCODE_b);
 		addButton(Common::Rect(234, 74, 308, 82), 0);
@@ -122,7 +122,7 @@ int Town::townAction(int actionId) {
 		// Guild
 		loadStrings("spldesc.bin");
 		_icons1.load("esc.icn");
-		addButton(Common::Rect(261, 100, 285, 120), Common::KEYCODE_ESCAPE, &_icons1);
+		addButton(Common::Rect(261, 108, 285, 128), Common::KEYCODE_ESCAPE, &_icons1);
 		addButton(Common::Rect(234, 54, 308, 62), 0);
 		addButton(Common::Rect(234, 64, 308, 72), Common::KEYCODE_b);
 		addButton(Common::Rect(234, 74, 308, 82), Common::KEYCODE_s);
@@ -152,7 +152,7 @@ int Town::townAction(int actionId) {
 	case 4:
 		// Temple
 		_icons1.load("esc.icn");
-		addButton(Common::Rect(261, 100, 285, 120), Common::KEYCODE_ESCAPE, &_icons1);
+		addButton(Common::Rect(261, 108, 285, 128), Common::KEYCODE_ESCAPE, &_icons1);
 		addButton(Common::Rect(234, 54, 308, 62), Common::KEYCODE_h);
 		addButton(Common::Rect(234, 64, 308, 72), Common::KEYCODE_d);
 		addButton(Common::Rect(234, 74, 308, 82), Common::KEYCODE_u);
@@ -344,7 +344,7 @@ Common::String Town::createTownText(Character &ch) {
 	case 1:
 		// Blacksmith
 		return Common::String::format(Res.BLACKSMITH_TEXT,
-			XeenEngine::printMil(party._gold).c_str());
+			ch._name.c_str(), XeenEngine::printMil(party._gold).c_str());
 
 	case 2:
 		// Guild