[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.36,1.37 dimuse_music.cpp,1.11,1.12 dimuse_tables.cpp,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Sun Jan 18 10:43:02 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1:/tmp/cvs-serv28193a/imuse_digi

Modified Files:
	dimuse.cpp dimuse_music.cpp dimuse_tables.cpp 
Log Message:
I recommend turning on signedness warnings, and honoring them :-)

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- dimuse.cpp	18 Jan 2004 11:39:29 -0000	1.36
+++ dimuse.cpp	18 Jan 2004 18:42:44 -0000	1.37
@@ -412,7 +412,6 @@
 	int cmd = a;
 	int soundId = b;
 	int sub_cmd = c;
-	int chan = -1;
 
 	if (!cmd)
 		return;

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dimuse_music.cpp	18 Jan 2004 18:04:41 -0000	1.11
+++ dimuse_music.cpp	18 Jan 2004 18:42:44 -0000	1.12
@@ -37,7 +37,7 @@
 	}
 
 	if (num == -1) {
-		for (l = 0; _digStateMusicMap[l].roomId != -1; l++) {
+		for (l = 0; /* _digStateMusicMap[l].roomId != -1 */ ; l++) {	// FIXME comparing an unsigned int with -1, are we? :-)
 			if ((_digStateMusicMap[l].roomId == stateId)) {
 				break;
 			}

Index: dimuse_tables.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_tables.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dimuse_tables.cpp	18 Jan 2004 16:32:30 -0000	1.11
+++ dimuse_tables.cpp	18 Jan 2004 18:42:44 -0000	1.12
@@ -148,7 +148,7 @@
 	{45,  1,  0,  0,  0,  0 },
 	{87,  1,  0,  0,  0,  0 },
 	{111, 1,  0,  0,  0,  0 },
-	{-1,  1,  0,  0,  0,  0 }
+	{0xff,  1,  0,  0,  0,  0 }
 };
 
 const imuseDigTable _digStateMusicTable[] = {





More information about the Scummvm-git-logs mailing list