aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-01-07 23:34:35 +0000
committerTravis Howell2006-01-07 23:34:35 +0000
commit065f8680e36b10b82656019c7e51607564b5c9ce (patch)
tree15554cdc00bcf0596a2e73787c957444bf045045
parentfdd5cfb635e4f37c18fc86469c1140b6b90dd901 (diff)
downloadscummvm-rg350-065f8680e36b10b82656019c7e51607564b5c9ce.tar.gz
scummvm-rg350-065f8680e36b10b82656019c7e51607564b5c9ce.tar.bz2
scummvm-rg350-065f8680e36b10b82656019c7e51607564b5c9ce.zip
Fix compile.
svn-id: r19938
-rw-r--r--gob/music.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gob/music.cpp b/gob/music.cpp
index ed1973b2ba..4d613513b5 100644
--- a/gob/music.cpp
+++ b/gob/music.cpp
@@ -113,7 +113,7 @@ void Music::writeOPL(byte reg, byte val) {
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 @@ void Music::setKey(byte voice, byte note, bool on, bool spec) {
_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];