diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/agos/midi.cpp | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/agos/midi.cpp')
| -rw-r--r-- | engines/agos/midi.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp index 431f080bf2..b3ade91107 100644 --- a/engines/agos/midi.cpp +++ b/engines/agos/midi.cpp @@ -478,7 +478,7 @@ void MidiPlayer::loadMultipleSMF(Common::File *in, bool sfx) { // Make sure there's a MThd in->read(buf, 4); - if (memcmp(buf, "MThd", 4)) { + if (memcmp(buf, "MThd", 4) != 0) { warning("Expected MThd but found '%c%c%c%c' instead", buf[0], buf[1], buf[2], buf[3]); return; } @@ -487,7 +487,7 @@ void MidiPlayer::loadMultipleSMF(Common::File *in, bool sfx) { // Now skip all the MTrk blocks while (true) { in->read(buf, 4); - if (memcmp(buf, "MTrk", 4)) + if (memcmp(buf, "MTrk", 4) != 0) break; in->seek(in->readUint32BE(), SEEK_CUR); } @@ -524,7 +524,7 @@ void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) { memcpy(buf, &buf[2], 2); in->read(&buf[2], 2); } - if (memcmp(buf, "CAT ", 4)) { + if (memcmp(buf, "CAT ", 4) != 0) { error("Could not find 'CAT ' tag to determine resource size"); } size += 4 + in->readUint32BE(); |