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

[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:
6b003386f5 XEEN: Fix resistence gems when visiting a town location


Commit: 6b003386f54eccc0f60111e3518086a0310c763a
    https://github.com/scummvm/scummvm/commit/6b003386f54eccc0f60111e3518086a0310c763a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-17T16:40:09-05:00

Commit Message:
XEEN: Fix resistence gems when visiting a town location

Changed paths:
    engines/xeen/interface.cpp
    engines/xeen/resources.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 7481c1a..508874a 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -1384,11 +1384,11 @@ void Interface::assembleBorder() {
 	} else {
 		_fecpSprites.draw(0, _vm->_party->_fireResistence ? 9 : 8,
 			Common::Point(8, 8));
-		_fecpSprites.draw(0, _vm->_party->_electricityResistence ? 10 : 11,
+		_fecpSprites.draw(0, _vm->_party->_electricityResistence ? 11 : 10,
 			Common::Point(219, 8));
-		_fecpSprites.draw(0, _vm->_party->_coldResistence ? 12 : 13,
+		_fecpSprites.draw(0, _vm->_party->_coldResistence ? 13 : 12,
 			Common::Point(8, 134));
-		_fecpSprites.draw(0, _vm->_party->_poisonResistence ? 14 : 15,
+		_fecpSprites.draw(0, _vm->_party->_poisonResistence ? 15 : 14,
 			Common::Point(219, 134));
 	}
 
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index e6d9c3e..b16c257 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -748,16 +748,16 @@ const int Resources::TOWN_ACTION_FILES[2][7] = {
 	{ 3, 2, 4, 2, 4, 2, 1 }, { 5, 3, 7, 5, 4, 6, 1 }
 };
 
-const char *const Resources::BANK_TEXT = "\x0D\x02\x03""c\x0B""122\x09""013"
-	"\x0C""37D\x0C""dep\x09""040\x0C""37W\x0C""dith\x09""067ESC"
-	"\x01\x09""000\x0B""000Bank of Xeen\x0B""015\n"
-	"Bank\x03l\n"
-	"Gold\x03r\x09""000%s\x03l\n"
-	"Gems\x03r\x09""000%s\x03""c\n"
+const char *const Resources::BANK_TEXT = "\xD\x2\x3""c\xB""122\t013"
+	"\xC""37D\xC""dep\t040\xC""37W\xC""dith\t067ESC"
+	"\x1\t000\xB""000Bank of Xeen\xB""015\n"
+	"Bank\x3l\n"
+	"Gold\x3r\t000%s\x3l\n"
+	"Gems\x3r\t000%s\x3""c\n"
 	"\n"
-	"Party\x03l\n"
-	"Gold\x03r\x09""000%s\x03l\n"
-	"Gems\x03r\x09""000%s";
+	"Party\x3l\n"
+	"Gold\x3r\t000%s\x3l\n"
+	"Gems\x3r\t000%s";
 
 const char *const Resources::BLACKSMITH_TEXT = "\x01\x0D\x03""c\x0B""000\x09""000"
 	"Store Options for\x09""039\x0B""027%s\x03""l\x0B""046\n"