aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_digi
diff options
context:
space:
mode:
authorMax Horn2004-01-18 18:42:44 +0000
committerMax Horn2004-01-18 18:42:44 +0000
commitc44bdf033e5a8460fb8aa1312bf8cc0866f60c8e (patch)
tree8a424787ade187470bcf7b1a0fa8a28831561986 /scumm/imuse_digi
parent8f465b96bb0e0c66fae403519ca9a8344cb6dfed (diff)
downloadscummvm-rg350-c44bdf033e5a8460fb8aa1312bf8cc0866f60c8e.tar.gz
scummvm-rg350-c44bdf033e5a8460fb8aa1312bf8cc0866f60c8e.tar.bz2
scummvm-rg350-c44bdf033e5a8460fb8aa1312bf8cc0866f60c8e.zip
I recommend turning on signedness warnings, and honoring them :-)
svn-id: r12493
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r--scumm/imuse_digi/dimuse.cpp1
-rw-r--r--scumm/imuse_digi/dimuse_music.cpp2
-rw-r--r--scumm/imuse_digi/dimuse_tables.cpp2
3 files changed, 2 insertions, 3 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 0a66c3950b..e14a76dda1 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -412,7 +412,6 @@ void IMuseDigital::parseScriptCmds(int a, int b, int c, int d, int e, int f, int
int cmd = a;
int soundId = b;
int sub_cmd = c;
- int chan = -1;
if (!cmd)
return;
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp
index cf7033a38b..b854b5c482 100644
--- a/scumm/imuse_digi/dimuse_music.cpp
+++ b/scumm/imuse_digi/dimuse_music.cpp
@@ -37,7 +37,7 @@ void IMuseDigital::setDigMusicState(int stateId) {
}
if (num == -1) {
- for (l = 0; _digStateMusicMap[l].roomId != -1; l++) {
+ for (l = 0; /* _digStateMusicMap[l].roomId != -1 */ ; l++) { // FIXME comparing an unsigned int with -1, are we? :-)
if ((_digStateMusicMap[l].roomId == stateId)) {
break;
}
diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp
index c1b6703dca..537db77be0 100644
--- a/scumm/imuse_digi/dimuse_tables.cpp
+++ b/scumm/imuse_digi/dimuse_tables.cpp
@@ -148,7 +148,7 @@ const imuseRoomMap _digStateMusicMap[] = {
{45, 1, 0, 0, 0, 0 },
{87, 1, 0, 0, 0, 0 },
{111, 1, 0, 0, 0, 0 },
- {-1, 1, 0, 0, 0, 0 }
+ {0xff, 1, 0, 0, 0, 0 }
};
const imuseDigTable _digStateMusicTable[] = {