aboutsummaryrefslogtreecommitdiff
path: root/scumm/resource.cpp
diff options
context:
space:
mode:
authorMax Horn2003-04-11 11:40:35 +0000
committerMax Horn2003-04-11 11:40:35 +0000
commit8c78049154c7fbcf90b18a0b22ae2d5caec06431 (patch)
tree58388eb6c3cbaec448e0d83aac939e0d719ef531 /scumm/resource.cpp
parent16713d11769e59198246999516cd70ebbf74d8aa (diff)
downloadscummvm-rg350-8c78049154c7fbcf90b18a0b22ae2d5caec06431.tar.gz
scummvm-rg350-8c78049154c7fbcf90b18a0b22ae2d5caec06431.tar.bz2
scummvm-rg350-8c78049154c7fbcf90b18a0b22ae2d5caec06431.zip
made unblocked games get a little farther before crashing
svn-id: r6967
Diffstat (limited to 'scumm/resource.cpp')
-rw-r--r--scumm/resource.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index 54ca46c9aa..f8bfa1875c 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -422,15 +422,15 @@ void Scumm::readResTypeList(int id, uint32 tag, const char *name) {
else
num = _fileHandle.readByte();
- if (1 || _features & GF_AFTER_V6) {
- if (num != res.num[id]) {
- error("Invalid number of %ss (%d) in directory", name, num);
- }
- } else {
+ if (_features & GF_OLD_BUNDLE) {
if (num >= 0xFF) {
error("Too many %ss (%d) in directory", name, num);
}
allocResTypeData(id, tag, num, name, 1);
+ } else {
+ if (num != res.num[id]) {
+ error("Invalid number of %ss (%d) in directory", name, num);
+ }
}
if (_features & GF_OLD_BUNDLE) {