aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorathrxx2019-07-07 15:45:22 +0200
committerathrxx2019-07-14 21:45:52 +0200
commit19643175a8fa605f8703c61c0060bbcaf69302ec (patch)
treef9e916fbaae12b34b0876b3d0ecc366bcca10ff8
parent4ee4d2d9aff62136c42004e4463b8d696571f9ec (diff)
downloadscummvm-rg350-19643175a8fa605f8703c61c0060bbcaf69302ec.tar.gz
scummvm-rg350-19643175a8fa605f8703c61c0060bbcaf69302ec.tar.bz2
scummvm-rg350-19643175a8fa605f8703c61c0060bbcaf69302ec.zip
SCUMM: limit 'Unrecognized base tag' warning to valid cases
This warning will not only show up if a tag is actually unrecognized but also in cases where the tag is recognized, but the resource size is 0. This happens quite a lot in the Amiga version of MI2 with 'SOU ' tags.
-rw-r--r--engines/scumm/sound.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index c90b13cfdc..14bf1c34c9 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1335,7 +1335,8 @@ int ScummEngine::readSoundResource(ResId idx) {
}
}
- warning("Unrecognized base tag 0x%08x in sound %d", basetag, idx);
+ if (total_size)
+ warning("Unrecognized base tag 0x%08x in sound %d", basetag, idx);
_res->_types[rtSound][idx]._roomoffs = RES_INVALID_OFFSET;
return 0;
}