aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray2003-05-01 11:40:21 +0000
committerJonathan Gray2003-05-01 11:40:21 +0000
commitd2a402f5fd5a6c603a53fda87572ecf0ce1e8a17 (patch)
treea218c69258ca43fc1b3db8558c1ac20254df078a
parentee9ff114ab8e56abbe787e258d26ce8fa3feb172 (diff)
downloadscummvm-rg350-d2a402f5fd5a6c603a53fda87572ecf0ce1e8a17.tar.gz
scummvm-rg350-d2a402f5fd5a6c603a53fda87572ecf0ce1e8a17.tar.bz2
scummvm-rg350-d2a402f5fd5a6c603a53fda87572ecf0ce1e8a17.zip
unbreak costumes in most games
svn-id: r7242
-rw-r--r--scumm/resource.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index d9d0eba892..c884b3a910 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -560,8 +560,12 @@ void Scumm::ensureResourceLoaded(int type, int i) {
// FIXME - TODO: This check used to be "i==0". However, that causes
// problems when using this function to ensure charset 0 is loaded.
- // Quesetion: Why was this check like that in the first place?
- if (i < 0)
+ // Question: Why was this check like that in the first place?
+ // Answer: costumes with an index of zero in the newer games at least
+ // TODO: determine after what version this behaviour changes...
+ if ((_gameId == GID_ZAK256) && (i < 0))
+ return;
+ else if (i == 0)
return;
if (i <= res.num[type])