aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
diff options
context:
space:
mode:
authorJames Brown2003-01-11 18:52:19 +0000
committerJames Brown2003-01-11 18:52:19 +0000
commit911353c7109f4ed43eb87a6f709e618d622d8afc (patch)
tree08f46d94267df54abefa265a4c3707ec3a912adc /scumm/object.cpp
parent09445ada177bf5cbfd7a613a35905659888ee7bd (diff)
downloadscummvm-rg350-911353c7109f4ed43eb87a6f709e618d622d8afc.tar.gz
scummvm-rg350-911353c7109f4ed43eb87a6f709e618d622d8afc.tar.bz2
scummvm-rg350-911353c7109f4ed43eb87a6f709e618d622d8afc.zip
This is the second biggest hack I've ever seen! FlObject 188/189 hack.
svn-id: r6400
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r--scumm/object.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index b685f68ef6..7de49d821e 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -121,6 +121,14 @@ int Scumm::getObjectIndex(int object)
if (_objs[i].obj_nr == object)
return i;
}
+
+ // FIXME: Major HACK. This is probably the worst biggest
+ // hack in the whole engine. It's that bad.
+ // (Workaround flobject 188/189 not loaded bug)
+ if (_gameId == GID_CMI && ((object == 188 || object == 189))) {
+ loadFlObject(object, 3);
+ return getObjectIndex(object);
+ }
return -1;
}
}
@@ -145,6 +153,7 @@ int Scumm::whereIsObject(int object)
return WIO_FLOBJECT;
return WIO_ROOM;
}
+
return WIO_NOT_FOUND;
}