aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-03-03 10:56:46 +0000
committerMax Horn2004-03-03 10:56:46 +0000
commitad820d7893cdc80afc466d31fa91202fa72ba2ca (patch)
tree7e89204b6f9cc7db00620eb58aa83165aacb0fb1 /scumm
parent306d16441ee30e5cf8e1c9af5f754c81d03b43cf (diff)
downloadscummvm-rg350-ad820d7893cdc80afc466d31fa91202fa72ba2ca.tar.gz
scummvm-rg350-ad820d7893cdc80afc466d31fa91202fa72ba2ca.tar.bz2
scummvm-rg350-ad820d7893cdc80afc466d31fa91202fa72ba2ca.zip
unsigned ints are always >= 0 (fix warnings)
svn-id: r13167
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse_digi/dimuse_music.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp
index b12a84686a..711013e843 100644
--- a/scumm/imuse_digi/dimuse_music.cpp
+++ b/scumm/imuse_digi/dimuse_music.cpp
@@ -44,17 +44,17 @@ void IMuseDigital::setDigMusicState(int stateId) {
}
num = l;
- assert(_digStateMusicMap[num].unk1 >= 0 && _digStateMusicMap[num].unk1 < 11);
+ assert(_digStateMusicMap[num].unk1 < 11);
int val2 = _attributesTable[_digStateMusicMap[num].unk1];
if (val2 == 0) {
- assert(_digStateMusicMap[num].unk3 >= 0 && _digStateMusicMap[num].unk3 < 11);
+ assert(_digStateMusicMap[num].unk3 < 11);
if (_attributesTable[_digStateMusicMap[num].unk3] != 0) {
num = _digStateMusicMap[num].unk4;
} else {
num = _digStateMusicMap[num].musicTableIndex;
}
} else {
- assert(_digStateMusicMap[num].unk1 >= 0 && _digStateMusicMap[num].unk2 < 11);
+ assert(_digStateMusicMap[num].unk2 < 11);
int val = _attributesTable[_digStateMusicMap[num].unk2];
if (val == 0) {
num = _digStateMusicMap[num].musicTableIndex + val2;