corrections to music map table

svn-id: r5112

1 files changed, 116 insertions, 120 deletions

diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index f4c5d9736f..dd156308ad 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -4861,129 +4861,125 @@ struct imuse_music_table {
 };
 
 struct imuse_music_map {
-	int16 index;
-	int16 map_index;
+	int16 room;
 	int16 table_index;
 	int16 param1;
 	int16 param2;
 };
 
 static const imuse_music_map _digStateMusicMap[] = {
-	{0,		0,	0,	0,	0	},
-	{1,		1,	0,	0,	0	},
-	{2,		2,	2,	0,	0	},
-	{3,		4,	3,	0,	0	},
-	{4,		5,	3,	0,	0	},
-	{5,		6,	3,	0,	0	},
-	{6,		7,	3,	0,	0	},
-	{7,		8,	4,	0,	0	},
-	{8,		9,	5,	0,	0	},
-	{9,		10,	4,	0,	0	},
-	{10,	12,	5,	0,	0	},
-	{11,	14,	5,	0,	0	},
-	{12,	15,	6,	29,	7	},
-	{13,	16,	8,	0,	0	},
-	{14,	17,	1,	0,	0	},
-	{15,	18,	9,	0,	0	},
-	{16,	19,	9,	0,	0	},
-	{17,	20,	6,	0,	0	},
-	{18,	21,	6,	0,	0	},
-	{19,	22,	44,	0,	0	},
-	{20,	23,	10,	7,	0	},
-	{21,	24,	26,	0,	0	},
-	{22,	25,	17,	0,	0	},
-	{23,	26,	17,	0,	0	},
-	{24,	27,	18,	0,	0	},
-	{25,	28,	1,	0,	0	},
-	{26,	29,	20,	0,	0	},
-	{27,	30,	22,	0,	0	},
-	{28,	31,	23,	0,	0	},
-	{29,	32,	22,	0,	0	},
-	{30,	33,	26,	0,	0	},
-	{31,	34,	24,	0,	0	},
-	{32,	35,	1,	0,	0	},
-	{33,	36,	1,	0,	0	},
-	{34,	37,	42,	0,	0	},
-	{35,	38,	43,	0,	0	},
-	{36,	39,	44,	0,	0	},
-	{37,	41,	43,	0,	0	},
-	{38,	42,	44,	0,	0	},
-	{39,	43,	43,	0,	0	},
-	{40,	44,	45,	0,	0	},
-	{41,	47,	1,	117,45},
-	{42,	48,	43,	0,	0	},
-	{43,	49,	44,	0,	0	},
-	{44,	51,	1,	0,	0	},
-	{45,	53,	28,	0,	0	},
-	{46,	54,	28,	0,	0	},
-	{47,	55,	29,	0,	0	},
-	{48,	56,	29,	0,	0	},
-	{49,	57,	29,	0,	0	},
-	{50,	58,	31,	0,	0	},
-	{51,	59,	1,	0,	0	},
-	{52,	60,	37,	0,	0	},
-	{53,	61,	39,	0,	0	},
-	{54,	62,	38,	0,	0	},
-	{55,	63,	39,	0,	0	},
-	{56,	64,	39,	0,	0	},
-	{57,	65,	40,	0,	0	},
-	{58,	66,	40,	0,	0	},
-	{59,	67,	39,	0,	0	},
-	{60,	68,	1,	0,	0	},
-	{61,	69,	49,	0,	0	},
-	{62,	70,	50,	0,	0	},
-	{63,	73,	51,	0,	0	},
-	{64,	75,	1,	0,	0	},
-	{65,	76,	52,	9,	0	},
-	{66,	77,	63,	0,	0	},
-	{67,	78,	1,	0,	0	},
-	{68,	79,	21,	0,	0	},
-	{69,	82,	1,	0,	0	},
-	{70,	85,	0,	0,	0	},
-	{71,	86,	33,	6,	35},
-	{72,	89,	16,	0,	0	},
-	{73,	90,	57,	10,	0	},
-	{74,	91,	32,	0,	0	},
-	{75,	88,	25,	0,	0	},
-	{76,	92,	0,	0,	0	},
-	{77,	93,	19,	0,	0	},
-	{78,	95,	41,	0,	0	},
-	{79,	80,	48,	0,	0	},
-	{80,	81,	27,	0,	0	},
-	{81,	83,	36,	0,	0	},
-	{82,	94,	1,	0,	0	},
-	{83,	40,	13,	0,	0	},
-	{84,	96,	14,	0,	0	},
-	{85,	97,	11,	0,	0	},
-	{86,	98,	15,	0,	0	},
-	{87,	99,	17,	0,	0	},
-	{88,	100,38,	0,	0	},
-	{89,	101,0,	0,	0	},
-	{90,	103,0,	0,	0	},
-	{91,	104,44,	0,	0	},
-	{92,	11,	47,	0,	0	},
-	{93,	3,	30,	128,29},
-	{94,	105,0,	0,	0	},
-	{95,	106,1,	0,	0	},
-	{96,	107,1,	0,	0	},
-	{97,	108,1,	0,	0	},
-	{98,	47,	1,	0,	0	},
-	{99,	50,	1,	0,	0	},
-	{100,	52,	0,	0,	0	},
-	{101,	71,	1,	0,	0	},
-	{102,	13,	1,	0,	0	},
-	{103,	72,	1,	0,	0	},
-	{104,	46,	33,	6,	35},
-	{105,	74,	1,	0,	0	},
-	{106,	84,	1,	0,	0	},
-	{107,	66,	1,	0,	0	},
-	{108,	102,1,	0,	0	},
-	{109,	109,1,	0,	0	},
-	{110,	110,2,	0,	0	},
-	{111,	45,	1,	0,	0	},
-	{112,	87,	1,	0,	0	},
-	{113,	111,1,	0,	0	},
-	{-1,	-1,	1,	0,	0	},
+	{1,		0,	0,	0	},
+	{2,		2,	0,	0	},
+	{3,		47,	0,	0	},
+	{4,		3,	0,	0	},
+	{5,		3,	0,	0	},
+	{6,		3,	0,	0	},
+	{7,		3,	0,	0	},
+	{8,		4,	0,	0	},
+	{9,		5,	0,	0	},
+	{10,	4,	0,	0	},
+	{11,	44,	0,	0	},
+	{12,	5,	0,	0	},
+	{13,	1,	0,	0	},
+	{14,	5,	0,	0	},
+	{15,	6,	29,	7	},
+	{16,	8,	0,	0	},
+	{17,	1,	0,	0	},
+	{18,	9,	0,	0	},
+	{19,	9,	0,	0	},
+	{20,	6,	0,	0	},
+	{21,	6,	0,	0	},
+	{22,	44,	0,	0	},
+	{23,	10,	7,	0	},
+	{24,	26,	0,	0	},
+	{25,	17,	0,	0	},
+	{26,	17,	0,	0	},
+	{27,	18,	0,	0	},
+	{28,	1,	0,	0	},
+	{29,	20,	0,	0	},
+	{30,	22,	0,	0	},
+	{31,	23,	0,	0	},
+	{32,	22,	0,	0	},
+	{33,	26,	0,	0	},
+	{34,	24,	0,	0	},
+	{35,	1,	0,	0	},
+	{36,	1,	0,	0	},
+	{37,	42,	0,	0	},
+	{38,	43,	0,	0	},
+	{39,	44,	0,	0	},
+	{40,	1,	0,	0	},
+	{41,	43,	0,	0	},
+	{42,	44,	0,	0	},
+	{43,	43,	0,	0	},
+	{44,	45,	0,	0	},
+	{45,	1,	0,	0	},
+	{46,	33,	6,	35},
+	{47,	1,	117,45},
+	{48,	43,	0,	0	},
+	{49,	44,	0,	0	},
+	{50,	1,	0,	0	},
+	{51,	1,	0,	0	},
+	{52,	0,	0,	0	},
+	{53,	28,	0,	0	},
+	{54,	28,	0,	0	},
+	{55,	29,	0,	0	},
+	{56,	29,	0,	0	},
+	{57,	29,	0,	0	},
+	{58,	31,	0,	0	},
+	{59,	1,	0,	0	},
+	{60,	37,	0,	0	},
+	{61,	39,	0,	0	},
+	{62,	38,	0,	0	},
+	{63,	39,	0,	0	},
+	{64,	39,	0,	0	},
+	{65,	40,	0,	0	},
+	{66,	1,	0,	0	},
+	{67,	40,	0,	0	},
+	{68,	39,	0,	0	},
+	{69,	1,	0,	0	},
+	{70,	49,	0,	0	},
+	{71,	1,	0,	0	},
+	{72,	1,	0,	0	},
+	{73,	50,	0,	0	},
+	{74,	1,	0,	0	},
+	{75,	51,	0,	0	},
+	{76,	1,	0,	0	},
+	{77,	52,	7,	0	},
+	{78,	63,	0,	0	},
+	{79,	1,	0,	0	},
+	{80,	41,	0,	0	},
+	{81,	48,	0,	0	},
+	{82,	21,	0,	0	},
+	{83,	27,	0,	0	},
+	{84,	1,	0,	0	},
+	{85,	1,	0,	0	},
+	{86,	0,	0,	0	},
+	{87,	1,	0,	0	},
+	{88,	32,	0,	0	},
+	{89,	33,	6,	35},
+	{90,	16,	0,	0	},
+	{91,	57,	0,	0	},
+	{92,	25,	0,	0	},
+	{93,	0,	0,	0	},
+	{94,	36,	0,	0	},
+	{95,	19,	0,	0	},
+	{96,	13,	0,	0	},
+	{97,	14,	0,	0	},
+	{98,	11,	0,	0	},
+	{99,	15,	0,	0	},
+	{100,	17,	0,	0	},
+	{101,	38,	0,	0	},
+	{102,	1,	0,	0	},
+	{103,	0,	0,	0	},
+	{104,	0,	0,	0	},
+	{105,	30, 128,29},
+	{106,	0,	0,	0	},
+	{107,	1,	0,	0	},
+	{108,	1,	0,	0	},
+	{109,	1,	0,	0	},
+	{110,	2,	0,	0	},
+	{111,	1,	0,	0	},
+	{-1,	1,	0,	0	},
 };
 
 static const imuse_music_table _digStateMusicTable[] = {
@@ -5526,13 +5522,13 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i
 			if (_scumm->_gameId == GID_FT)
 				return 0;
 			for(l = 0;; l++) {
-				if (_digStateMusicMap[l].index == -1) {
+				if (_digStateMusicMap[l].room == -1) {
 					return 1;
 				}
-				if ((_digStateMusicMap[l].map_index == b)) {
+				if ((_digStateMusicMap[l].room == b)) {
 					int16 music = _digStateMusicMap[l].table_index;
 					debug(1, "Play imuse music: %s, %s, %s", _digStateMusicTable[music].name, _digStateMusicTable[music].title, _digStateMusicTable[music].filename);
-					if (_digStateMusicTable[l].filename[0] != 0) {
+					if (_digStateMusicTable[music].filename[0] != 0) {
 						_scumm->_sound->playBundleMusic((char*)&_digStateMusicTable[music].filename);
 					}
 					return 0;