diff options
| -rw-r--r-- | engines/xeen/resources.cpp | 13 | ||||
| -rw-r--r-- | engines/xeen/resources.h | 4 | ||||
| -rw-r--r-- | engines/xeen/town.cpp | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp index 082f9b881e..b48f4ac5c9 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 000e332ad4..aa19baadcb 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 75b7581e2a..4b98a2dc33 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) { |