diff options
| author | Paweł Kołodziejski | 2004-01-18 19:00:44 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-01-18 19:00:44 +0000 |
| commit | c7a66d4498127adbb13311cf2cf23dd4459965de (patch) | |
| tree | d5a4ee45fda97ef9cca41e5ba33260c4f00fe921 | |
| parent | e67b734fd2fe9109b1b748eed14222944e99d78d (diff) | |
| download | scummvm-rg350-c7a66d4498127adbb13311cf2cf23dd4459965de.tar.gz scummvm-rg350-c7a66d4498127adbb13311cf2cf23dd4459965de.tar.bz2 scummvm-rg350-c7a66d4498127adbb13311cf2cf23dd4459965de.zip | |
right it should be signed :)
svn-id: r12495
| -rw-r--r-- | scumm/imuse_digi/dimuse.h | 2 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_music.cpp | 2 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_tables.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h index 4aba18d130..6869c3d822 100644 --- a/scumm/imuse_digi/dimuse.h +++ b/scumm/imuse_digi/dimuse.h @@ -146,7 +146,7 @@ public: }; struct imuseRoomMap { - byte roomId; + int8 roomId; byte musicTableIndex; byte unk1; byte unk2; diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp index b854b5c482..cf7033a38b 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++) { // FIXME comparing an unsigned int with -1, are we? :-) + for (l = 0; _digStateMusicMap[l].roomId != -1; l++) { if ((_digStateMusicMap[l].roomId == stateId)) { break; } diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp index 537db77be0..c1b6703dca 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 }, - {0xff, 1, 0, 0, 0, 0 } + {-1, 1, 0, 0, 0, 0 } }; const imuseDigTable _digStateMusicTable[] = { |