[Scummvm-cvs-logs] CVS: scummvm/gob music.cpp,1.1,1.2

kirben kirben at users.sourceforge.net
Sat Jan 7 15:35:02 CET 2006


Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11136/gob

Modified Files:
	music.cpp 
Log Message:

Fix compile.


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/music.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- music.cpp	7 Jan 2006 22:28:54 -0000	1.1
+++ music.cpp	7 Jan 2006 23:34:35 -0000	1.2
@@ -113,7 +113,7 @@
 void Music::setFreqs(void) {
 	byte lin;
 	byte col;
-	long val;
+	long val = 0;
 
 	// Run through the 11 channels
 	for (lin = 0; lin < 11; lin ++) {
@@ -238,7 +238,7 @@
 
 	_notes[voice] = note;
 	note += _notCol[voice];
-	note = MIN(0x5F, note);
+	note = MIN(0x5F, (int)note);
 	octa = note / 12;
 	freq = _freqs[_notLin[voice]][note - octa * 12];
 





More information about the Scummvm-git-logs mailing list