[Scummvm-git-logs] scummvm master -> 1d5453c6cb5a133d9797bb06f9101adcc448c793

[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:
1d5453c6cb XEEN: Fix music/background loading for town locations


Commit: 1d5453c6cb5a133d9797bb06f9101adcc448c793
    https://github.com/scummvm/scummvm/commit/1d5453c6cb5a133d9797bb06f9101adcc448c793
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-23T16:27:55-05:00

Commit Message:
XEEN: Fix music/background loading for town locations

Changed paths:
    engines/xeen/resources.cpp
    engines/xeen/resources.h
    engines/xeen/town.cpp


diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index 082f9b8..b48f4ac 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -691,14 +691,15 @@ const int Resources::TOWN_MAXES[2][11] = {
 	{ 26, 19, 48, 27, 26, 37, 16, 16, 16, 16, 16 }
 };
 
-const char *const Resources::TOWN_ACTION_MUSIC[14] = {
-	"bank.m", "smith.m", "guild.m", "tavern.m", "temple.m",
-	"grounds.m", "endgame.m", "bank.m", "sf09.m", "guild.m",
-	"tavern.m", "temple.m", "smith.m", "endgame.m"
+const char *const Resources::TOWN_ACTION_MUSIC[2][7] = {
+	{ "bank.m", "smith.m", "guild.m", "tavern.m",
+	"temple.m", "grounds.m", "endgame.m" },
+	{ "bank.m", "sf09.m", "guild.m", "tavern.m",
+	"temple.m", "smith.m", "endgame.m" }
 };
 
-const char *const Resources::TOWN_ACTION_SHAPES[4] = {
-	"bankr", "blck", "gild", "tvrn"
+const char *const Resources::TOWN_ACTION_SHAPES[7] = {
+	"bankr", "blck", "gild", "tvrn", "tmpl", "trng", "eface08"
 };
 
 const int Resources::TOWN_ACTION_FILES[2][7] = {
diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h
index 000e332..aa19baa 100644
--- a/engines/xeen/resources.h
+++ b/engines/xeen/resources.h
@@ -124,8 +124,8 @@ public:
 	static const int MAKE_ITEM_ARR5[8][2];
 	static const int OUTDOOR_DRAWSTRCT_INDEXES[44];
 	static const int TOWN_MAXES[2][11];
-	static const char *const TOWN_ACTION_MUSIC[14];
-	static const char *const TOWN_ACTION_SHAPES[4];
+	static const char *const TOWN_ACTION_MUSIC[2][7];
+	static const char *const TOWN_ACTION_SHAPES[7];
 	static const int TOWN_ACTION_FILES[2][7];
 	static const char *const BANK_TEXT;
 	static const char *const BLACKSMITH_TEXT;
diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp
index 75b7581..4b98a2d 100644
--- a/engines/xeen/town.cpp
+++ b/engines/xeen/town.cpp
@@ -203,7 +203,7 @@ int Town::townAction(int actionId) {
 		break;
 	}
 
-	sound.playSong(Res.TOWN_ACTION_MUSIC[actionId], 223);
+	sound.playSong(Res.TOWN_ACTION_MUSIC[_vm->_files->_isDarkCc][actionId], 223);
 
 	_townSprites.resize(Res.TOWN_ACTION_FILES[isDarkCc][actionId]);
 	for (uint idx = 0; idx < _townSprites.size(); ++idx) {