[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.23,1.24 imuse.h,1.5,1.6

Max Horn fingolfin at users.sourceforge.net
Tue Oct 1 15:43:17 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv15729

Modified Files:
	imuse.cpp imuse.h 
Log Message:
unsigned <-> signed, local vars were not inited

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- imuse.cpp	1 Oct 2002 21:19:52 -0000	1.23
+++ imuse.cpp	1 Oct 2002 22:39:15 -0000	1.24
@@ -4855,7 +4855,7 @@
 
 void IMuseDigital::handler() {
 	bool new_mixer;
-	int32 l, idx;
+	int32 l, idx = 0;
 
 	for (l = 0; l < MAX_DIGITAL_CHANNELS;l ++) {
 		if (_channel[l]._used) {
@@ -4939,7 +4939,7 @@
 			_channel[l]._numJumps = 0;
 			ptr += 16;
 
-			uint32 tag, size;
+			uint32 tag, size = 0;
 
 			for (;;) {
 		    tag = READ_BE_UINT32(ptr); ptr += 4;

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imuse.h	1 Oct 2002 21:19:52 -0000	1.5
+++ imuse.h	1 Oct 2002 22:39:15 -0000	1.6
@@ -99,7 +99,7 @@
 		uint8 _mixerFlags;
 		bool _used;
 		bool _toBeRemoved;
-		uint32 _mixerTrack;
+		int32 _mixerTrack;
 	} _channel[MAX_DIGITAL_CHANNELS];
 
 	Scumm * _scumm;





More information about the Scummvm-git-logs mailing list