[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_music.cpp,1.16,1.17

Max Horn fingolfin at users.sourceforge.net
Wed Mar 3 03:18:00 CET 2004


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

Modified Files:
	dimuse_music.cpp 
Log Message:
unsigned ints are always >= 0 (fix warnings)

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- dimuse_music.cpp	2 Mar 2004 20:35:48 -0000	1.16
+++ dimuse_music.cpp	3 Mar 2004 10:56:46 -0000	1.17
@@ -44,17 +44,17 @@
 		}
 		num = l;
 
-		assert(_digStateMusicMap[num].unk1 >= 0 && _digStateMusicMap[num].unk1 < 11);
+		assert(_digStateMusicMap[num].unk1 < 11);
 		int val2 = _attributesTable[_digStateMusicMap[num].unk1];
 		if (val2 == 0) {
-			assert(_digStateMusicMap[num].unk3 >= 0 && _digStateMusicMap[num].unk3 < 11);
+			assert(_digStateMusicMap[num].unk3 < 11);
 			if (_attributesTable[_digStateMusicMap[num].unk3] != 0) {
 				num = _digStateMusicMap[num].unk4;
 			} else {
 				num = _digStateMusicMap[num].musicTableIndex;
 			}
 		} else {
-			assert(_digStateMusicMap[num].unk1 >= 0 && _digStateMusicMap[num].unk2 < 11);
+			assert(_digStateMusicMap[num].unk2 < 11);
 			int val = _attributesTable[_digStateMusicMap[num].unk2];
 			if (val == 0) {
 				num = _digStateMusicMap[num].musicTableIndex + val2;





More information about the Scummvm-git-logs mailing list