[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.52,1.53 dimuse_music.cpp,1.19,1.20 dimuse_tables.cpp,1.16,1.17

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Mar 27 10:24:01 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12254

Modified Files:
	dimuse.cpp dimuse_music.cpp dimuse_tables.cpp 
Log Message:
cleanup, and fix bug in table

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- dimuse.cpp	27 Mar 2004 17:03:42 -0000	1.52
+++ dimuse.cpp	27 Mar 2004 18:12:18 -0000	1.53
@@ -495,21 +495,17 @@
 				}
 			}
 		} else if ((_vm->_gameId == GID_CMI) && (_vm->_features & GF_DEMO)) {
+			fadeOutMusic(120);
 			if (b == 2) {
-				fadeOutMusic(120);
-				startMusic("in1.imx", 2002, 0, 127);
+				startMusic("in1.imx", 1100, 0, 127);
 			} else if (b == 4) {
-				fadeOutMusic(120);
-				startMusic("in2.imx", 2004, 0, 127);
+				startMusic("in2.imx", 1120, 0, 127);
 			} else if (b == 8) {
-				fadeOutMusic(120);
-				startMusic("out1.imx", 2008, 0, 127);
+				startMusic("out1.imx", 1140, 0, 127);
 			} else if (b == 9) {
-				fadeOutMusic(120);
-				startMusic("out2.imx", 2009, 0, 127);
+				startMusic("out2.imx", 1150, 0, 127);
 			} else if (b == 16) {
-				fadeOutMusic(120);
-				startMusic("gun.imx", 2016, 0, 127);
+				startMusic("gun.imx", 1210, 0, 127);
 			} else {
 				warning("imuse digital: set state unknown for cmi demo: %d, room: %d", b, _vm->_currentRoom);
 			}


Index: dimuse_tables.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_tables.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- dimuse_tables.cpp	23 Mar 2004 21:42:47 -0000	1.16
+++ dimuse_tables.cpp	27 Mar 2004 18:12:18 -0000	1.17
@@ -152,7 +152,7 @@
 };
 
 const imuseDigTable _digStateMusicTable[] = {
-	{0,   60, "STATE_NULL",          0, 0, ""},
+	{0, 1000, "STATE_NULL",          0, 0, ""},
 	{0, 1001, "stateNoChange",       0, 0, ""},
 	{3, 1100, "stateAstShip",        2, 0, "ASTERO~1.IMU"},
 	{3, 1120, "stateAstClose",       2, 0, "ASTERO~2.IMU"},





More information about the Scummvm-git-logs mailing list