diff options
| author | Paweł Kołodziejski | 2003-06-27 05:02:01 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-06-27 05:02:01 +0000 |
| commit | 9385979376851b4696f6504785275fdb6624d46a (patch) | |
| tree | 18cbfc8cd8c8b64deb48b07a1b0c0f2519cf2e68 | |
| parent | 1785e0e30504f4cdaf29a31eec0f58de700ab8b1 (diff) | |
| download | scummvm-rg350-9385979376851b4696f6504785275fdb6624d46a.tar.gz scummvm-rg350-9385979376851b4696f6504785275fdb6624d46a.tar.bz2 scummvm-rg350-9385979376851b4696f6504785275fdb6624d46a.zip | |
fixed warning
svn-id: r8664
| -rw-r--r-- | scumm/object.cpp | 4 | ||||
| -rw-r--r-- | sound/mixer.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 1926589d38..f81b12f1a9 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -1110,7 +1110,7 @@ void Scumm::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id, uint else searchptr = roomptr; assert(searchptr); - ResourceIterator obcds(searchptr, _features & GF_SMALL_HEADER); + ResourceIterator obcds(searchptr, (_features & GF_SMALL_HEADER) != 0); for (i = 0;;) { obcdptr = obcds.findNext(MKID('OBCD')); if (obcdptr == NULL) @@ -1138,7 +1138,7 @@ void Scumm::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id, uint roomptr = fo->roomptr; if (findWhat & foImageHeader) { - ResourceIterator obims(roomptr, _features & GF_SMALL_HEADER); + ResourceIterator obims(roomptr, (_features & GF_SMALL_HEADER) != 0); for (i = 0;;) { obimptr = obims.findNext(MKID('OBIM')); if (obimptr == NULL) diff --git a/sound/mixer.cpp b/sound/mixer.cpp index b2c553a31a..7450960370 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -848,7 +848,7 @@ ChannelMP3::ChannelMP3(SoundMixer *mixer, void *sound, uint size, byte flags) _position = 0; _size = size; _ptr = (byte *)sound; - _releasePtr = (flags & SoundMixer::FLAG_AUTOFREE); + _releasePtr = (flags & SoundMixer::FLAG_AUTOFREE) != 0; /* This variable is the number of samples to cut at the start of the MP3 file. This is needed to have lip-sync as the MP3 file have some miliseconds |