[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob music.cpp,NONE,1.1 music.h,NONE,1.1 cdrom.cpp,1.6,1.7 draw.cpp,1.17,1.18 draw.h,1.8,1.9 game.cpp,1.31,1.32 game.h,1.7,1.8 gob.cpp,1.30,1.31 gob.h,1.14,1.15 goblin.cpp,1.27,1.28 goblin.h,1.7,1.8 init.cpp,1.14,1.15 inter.cpp,1.29,1.30 inter_v1.cpp,1.2,1.3 map.cpp,1.19,1.20 module.mk,1.6,1.7 mult.cpp,1.15,1.16 parse.cpp,1.17,1.18 scenery.cpp,1.22,1.23
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush channel.h,1.20,1.21 imuse_channel.cpp,1.33,1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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];
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob music.cpp,NONE,1.1 music.h,NONE,1.1 cdrom.cpp,1.6,1.7 draw.cpp,1.17,1.18 draw.h,1.8,1.9 game.cpp,1.31,1.32 game.h,1.7,1.8 gob.cpp,1.30,1.31 gob.h,1.14,1.15 goblin.cpp,1.27,1.28 goblin.h,1.7,1.8 init.cpp,1.14,1.15 inter.cpp,1.29,1.30 inter_v1.cpp,1.2,1.3 map.cpp,1.19,1.20 module.mk,1.6,1.7 mult.cpp,1.15,1.16 parse.cpp,1.17,1.18 scenery.cpp,1.22,1.23
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush channel.h,1.20,1.21 imuse_channel.cpp,1.33,1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list