fixes for imuse digital table

svn-id: r8630

1 files changed, 21 insertions, 21 deletions

diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp
index 47cf3d48a7..3fafc2684a 100644
--- a/scumm/imuse_digi.cpp
+++ b/scumm/imuse_digi.cpp
@@ -213,9 +213,9 @@ static const imuse_music_table _digStateMusicTable[] = {
 	{27,	1500,	0, 3, 0, 0, "stateTombTramNear",		"Tram (tomb-near)",			"TRAM(T~1.IMU"},
 	{28,	1510,	0, 3,28, 0, "stateTombBase",				"Tomb (amb-base)",			"TOMB(A~1.IMU"},
 	{29,	1520,	0, 3,28, 0, "stateTombSpire",				"Tomb (amb-spire)",			"TOMB(A~2.IMU"},
-	{30,	1530,	0, 3, 0, 0, "stateTombCave",				"Tomb (amb-cave)",			"TOMB(A~3.IMU"},
-	{31,	1540,	0, 3, 0, 0, "stateTombCrypt",				"Tomb (crypt)",					"TOMB(C~1.IMU"},
-	{32,	1550,	0, 3, 0, 0, "stateTombGuards",			"Tomb (crypt-guards)",	"TOMB(C~2.IMU"},
+	{30,	1530,	0, 3,28, 0, "stateTombCave",				"Tomb (amb-cave)",			"TOMB(A~3.IMU"},
+	{31,	1540,	0, 3,31, 0, "stateTombCrypt",				"Tomb (crypt)",					"TOMB(C~1.IMU"},
+	{32,	1550,	0, 3,31, 0, "stateTombGuards",			"Tomb (crypt-guards)",	"TOMB(C~2.IMU"},
 	{33,	1560,	0, 3, 0, 0, "stateTombInner",				"Tomb (inner)",					"TOMB(I~1.IMU"},
 	{34,	1570,	0, 3, 0, 0, "stateTombCreator1",		"Tomb (creator 1)",			"TOMB(C~3.IMU"},
 	{35,	1580,	0, 3, 0, 0, "stateTombCreator2",		"Tomb (creator 2)",			"TOMB(C~4.IMU"},
@@ -228,7 +228,7 @@ static const imuse_music_table _digStateMusicTable[] = {
 	{42,	1710,	0, 3, 0, 0, "stateMapTramFar",			"Tram (map-far)",				"TRAM(M~4.IMU"},
 	{43,	1720,	0, 3,43, 0, "stateMapCanyon",				"Map (amb-canyon)",			"MAP(AM~1.IMU"},
 	{44,	1730,	0, 3,43, 0, "stateMapExposed",			"Map (amb-exposed)",		"MAP(AM~2.IMU"},
-	{45,	1750,	0, 3, 0, 0, "stateMapNestEmpty",		"Map (amb-nest)",				"MAP(AM~4.IMU"},
+	{45,	1750,	0, 3,43, 0, "stateMapNestEmpty",		"Map (amb-nest)",				"MAP(AM~4.IMU"},
 	{46,	1760,	0, 3, 0, 0, "stateMapNestMonster",	"Map (monster)",				"MAP(MO~1.IMU"},
 	{47,	1770,	0, 3, 0, 0, "stateMapKlein",				"Map (klein)",					"MAP(KL~1.IMU"},
 	{48,	1800,	0, 3, 0, 0, "stateCathTramNear",		"Tram (cath-near)",			"TRAM(C~1.IMU"},
@@ -280,29 +280,29 @@ static const imuse_music_table _digSeqMusicTable[] = {
 	{0, 2120,	0, 0, 0, 0, "seqSerpentAppears",		"",												""						},
 	{0, 2130,	0, 0, 0, 0, "seqSerpentEats",				"",												""						},
 	{0, 2140,	0, 6, 0, 0, "seqBrinkRes1b",				"",												""						},
-	{0, 2141,	0, 4, 0, 0, "seqBrinkRes2a",				"Seq (brink's madness)",  "seq(BR~1.IMU"},
-	{0, 2150,	0, 3, 0, 0, "seqLockupEntry",				"Seq (brink's madness)",  "seq(BR~1.IMU"},
+	{0, 2141,	0, 4, 0, 0, "seqBrinkRes2a",				"Seq (brink's madness)",  "SEQ(BR~1.IMU"},
+	{0, 2150,	0, 3, 0, 0, "seqLockupEntry",				"Seq (brink's madness)",  "SEQ(BR~1.IMU"},
 	{0, 2160,	0, 0, 0, 0, "seqSerpentExplodes",		"",												""						},
-	{0, 2170,	0, 3, 0, 0, "seqSwimUnderwater",		"Seq (descent)",					"SEQ(DE~1.IMU"},
+	{0, 2170,	0, 4, 0, 0, "seqSwimUnderwater",		"Seq (descent)",					"SEQ(DE~1.IMU"},
 	{0, 2175,	0, 4, 0, 0, "seqWavesPlunge",				"Seq (plunge)",						"SEQ(PL~1.IMU"},
 	{0, 2180,	0, 0, 0, 0, "seqCryptOpens",				"",												""						},
 	{0, 2190,	0, 0, 0, 0, "seqGuardsFight",				"",												""						},
-	{0, 2200,	0, 3, 0, 0, "seqCreatorRes1.1a",		"Seq (creator res 1.1a)", "seq(CR~1.IMU"},
+	{0, 2200,	0, 3, 0, 0, "seqCreatorRes1.1a",		"Seq (creator res 1.1a)", "SEQ(CR~1.IMU"},
 	{0, 2201,	0, 6, 0, 0, "seqCreatorRes1.2b",		"",												""						},
 	{0, 2210,	0, 6, 0, 0, "seqMaggieCapture1b",		"",												""						},
-	{0, 2220,	0, 3, 0, 0, "seqStealCrystals",			"Seq (brink's madness)",  "seq(BR~1.IMU"},
+	{0, 2220,	0, 3, 0, 0, "seqStealCrystals",			"Seq (brink's madness)",  "SEQ(BR~1.IMU"},
 	{0, 2230,	0, 0, 0, 0, "seqGetByMonster",			"",												""						},
 	{0, 2240,	0, 6, 0, 0, "seqKillMonster1b",			"",												""						},
-	{0, 2250,	0, 3, 0, 0, "seqCreatorRes2.1a",		"Seq (creator res 2.1a)", "seq(CR~2.IMU"},
+	{0, 2250,	0, 3, 0, 0, "seqCreatorRes2.1a",		"Seq (creator res 2.1a)", "SEQ(CR~2.IMU"},
 	{0, 2251,	0, 6, 0, 0, "seqCreatorRes2.2b",		"",												""						},
-	{0, 2252,	0, 4, 0, 0, "seqCreatorRes2.3a",		"Seq (creator res 2.3a)", "seq(CR~3.IMU"},
+	{0, 2252,	0, 4, 0, 0, "seqCreatorRes2.3a",		"Seq (creator res 2.3a)", "SEQ(CR~3.IMU"},
 	{0, 2260,	0, 0, 0, 0, "seqMaggieInsists",			"",												""						},
 	{0, 2270,	0, 0, 0, 0, "seqBrinkHelpCall",			"",												""						},
-	{0, 2280,	0, 3, 0, 0, "seqBrinkCrevice1a",		"Seq (brink crevice 1a)", "seq(BR~2.IMU"},
-	{0, 2281,	0, 3, 0, 0, "seqBrinkCrevice2a",		"Seq (brink crevice 2a)", "seq(BR~3.IMU"},
+	{0, 2280,	0, 3, 0, 0, "seqBrinkCrevice1a",		"Seq (brink crevice 1a)", "SEQ(BR~2.IMU"},
+	{0, 2281,	0, 3, 0, 0, "seqBrinkCrevice2a",		"Seq (brink crevice 2a)", "SEQ(BR~3.IMU"},
 	{0, 2290,	0, 6, 0, 0, "seqCathAccess1b",			"",												""						},
 	{0, 2291,	0, 4, 0, 0, "seqCathAccess2a",			"Seq (cath access 2a)",		"SEQ(CA~1.IMU"},
-	{0, 2300,	0, 3, 0, 0, "seqBrinkAtGenerator",  "seq (brink's madness)","seq(BR~1.IMU"},
+	{0, 2300,	0, 3, 0, 0, "seqBrinkAtGenerator",  "Seq (brink's madness)",  "SEQ(BR~1.IMU"},
 	{0, 2320,	0, 6, 0, 0, "seqFightBrink1b",			"",												""						},
 	{0, 2340,	0, 6, 0, 0, "seqMaggieDies1b",			"",												""						},
 	{0, 2346,	0, 6, 0, 0, "seqMaggieRes1b",				"",												""						},
@@ -343,18 +343,18 @@ static const imuse_music_table _comiStateMusicTable[] = {
 	{0, 1215,	0, 3, 0, 0,  "stateVoodooLady",		 "1215-Voodoo Lady",			"1215-V~1.IMX"},
 	{0, 1219,	0, 3, 0, 0,  "statePrePlundermap", "1219-Pre-Map",					"1219-P~1.IMX"},
 	{0, 1220,	0, 3, 0, 0,  "statePlundermap",		 "1220-Plunder Map",			"1220-P~1.IMX"},
-	{0, 1222,	0, 3, 0,800, "statePreCabana",		 "1222-Pre-Cabana",				"1222-P~1.IMX"},
+	{0, 1222,	0, 3, 0, 0,  "statePreCabana",		 "1222-Pre-Cabana",				"1222-P~1.IMX"},
 	{0, 1223,	0, 3, 0, 0,  "stateCabana",				 "1223-Cabana",						"1223-C~1.IMX"},
 	{0, 1224,	0, 3, 0, 0,  "statePostCabana",		 "1224-Post-Cabana",			"1224-P~1.IMX"},
 	{0, 1225,	0, 3, 0, 0,  "stateBeachClub",		 "1225-Beach Club",				"1225-B~1.IMX"},
 	{0, 1230,	0, 3, 0, 0,  "stateCliff",				 "1230-Cliff",						"1230-C~1.IMX"},
-	{0, 1232,	0, 3, 0, 0,  "stateBelly",				 "1232-Belly",						"1232-B~1.IMX"},
+	{0, 1232,	0, 3, 0,800, "stateBelly",				 "1232-Belly",						"1232-B~1.IMX"},
 	{0, 1235,	0, 3, 0, 0,  "stateQuicksand",		 "1235-Quicksand",				"1235-Q~1.IMX"},
 	{0, 1240,	0, 3, 0,800, "stateDangerBeach",   "1240-Danger Beach",			"1240-D~1.IMX"},
 	{0, 1241,	0,12, 2,800, "stateDangerBeachAlt","1240-Danger Beach",			"1240-D~1.IMX"},
 	{0, 1245,	0, 3, 0, 0,  "stateRowBoat",			 "1245-Row Boat",					"1245-R~1.IMX"},
 	{0, 1247,	0, 3, 0,800, "stateAlongside",		 "1247-Alongside",				"1247-A~1.IMX"},
-	{0, 1277,	0,12, 1,800, "stateAlongsideAlt",	 "1247-Alongside",				"1247-A~1.IMX"},
+	{0, 1248,	0,12, 1,800, "stateAlongsideAlt",	 "1247-Alongside",				"1247-A~1.IMX"},
 	{0, 1250,	0, 3, 0,500, "stateChimpBoat",		 "1250-Chimp Boat",				"1250-C~1.IMX"},
 	{0, 1255,	0, 3, 0,800, "stateMrFossey",			 "1255-Mr Fossey",				"1255-M~1.IMX"},
 	{0, 1259,	0, 3, 0, 0,  "statePreTown",			 "1259-Pre-Town",					"1259-P~1.IMX"},
@@ -431,9 +431,9 @@ static const imuse_music_table _comiSeqMusicTable[] = {
 	{0, 2222,	0, 8, 1, 0,  "seqPopBalloon",			"",												""},
 	{0, 2225,	0, 3, 0, 0,  "seqDropBalls",			"2225-Drop Balls",				"2225-D~1.IMX"},
 	{0, 2232,	0, 4, 0, 0,  "seqArriveBarber",		"2232-Arrive Barber",			"2232-A~1.IMX"},
-	{0, 2233,	0, 2, 2, 0,  "seqAtonal",					"2233-Atonal",						"2233-A~1.IMX"},
+	{0, 2233,	0, 3, 0, 0,  "seqAtonal",					"2233-Atonal",						"2233-A~1.IMX"},
 	{0, 2235,	0, 3, 0, 0,  "seqShaveHead1",			"2235-Shave Head",				"2235-S~1.IMX"},
-	{0, 2236,	0, 3, 0, 0,  "seqShaveHead2",			"2235-Shave Head",				"2235-S~1.IMX"},
+	{0, 2236,	0, 2, 2, 0,  "seqShaveHead2",			"2235-Shave Head",				"2235-S~1.IMX"},
 	{0, 2245,	0, 3, 0, 0,  "seqCaberLose",			"2245-Caber Lose",				"2245-C~1.IMX"},
 	{0, 2250,	0, 3, 0, 0,  "seqCaberWin",				"2250-Caber Win",					"2250-C~1.IMX"},
 	{0, 2255,	0, 3, 0, 0,  "seqDuel1",					"2255-Duel",							"2255-D~1.IMX"},
@@ -472,7 +472,7 @@ static const imuse_music_table _comiSeqMusicTable[] = {
 	{0, 2345,	0, 3, 0, 0,  "seqSwordWin",				"1340-Sword Win",					"1340-S~1.IMX"},
 	{0, 2347,	0, 3, 0, 0,  "seqGetMap",					"1345-Get Map",						"1345-G~1.IMX"},
 	{0, 2400,	0, 3, 0, 0,  "seqInterlude4",			"2400-Interlude4",				"2400-I~1.IMX"},
-	{0, 2405,	0, 0, 0, 0,  "seqSHIPWRECK",			"",												"2408-F~1.IMX"},
+	{0, 2405,	0, 0, 0, 0,  "seqSHIPWRECK",			"",												""},
 	{0, 2408,	0, 3, 0, 0,  "seqFakeCredits",		"2408-Fake Credits",			"2408-F~1.IMX"},
 	{0, 2410,	0, 3, 0, 0,  "seqPassOut",				"2410-Pass Out",					"2410-P~1.IMX"},
 	{0, 2414,	0, 3, 0, 0,  "seqGhostTalk",			"2414-Ghost Talk",				"2414-G~1.IMX"},
@@ -488,7 +488,7 @@ static const imuse_music_table _comiSeqMusicTable[] = {
 	{0, 2460,	0, 3, 0, 0,  "seqFight",					"2460-Fight",							"2460-F~1.IMX"},
 	{0, 2465,	0, 0, 0, 0,  "seqLAVE_RIDE",			"",												""},
 	{0, 2470,	0, 0, 0, 0,  "seqMORE_SLAW",			"",												""},
-	{0, 2480,	0, 0, 0, 0,  "seqLIFT_CURSE",			"",												""},
+	{0, 2475,	0, 0, 0, 0,  "seqLIFT_CURSE",			"",												""},
 	{0, 2500,	0, 3, 0, 0,  "seqInterlude5",			"2500-Interlude5",				"2500-I~1.IMX"},
 	{0, 2502,	0, 3, 0, 0,  "seqExitSkycar",			"2502-Exit Skycar",				"2502-E~1.IMX"},
 	{0, 2504,	0, 3, 0, 0,  "seqGrow1",					"2504-Grow",							"2504-G~1.IMX"},