aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2003-01-07 08:16:55 +0000
committerJames Brown2003-01-07 08:16:55 +0000
commit6426833420d3beb4137d654c507386394b3e4e74 (patch)
treeaab7bd017f3317a99d9dd1a8b45e445562aaeac3
parent02ff51659029afc2fce592d496f46aa94d172085 (diff)
downloadscummvm-rg350-6426833420d3beb4137d654c507386394b3e4e74.tar.gz
scummvm-rg350-6426833420d3beb4137d654c507386394b3e4e74.tar.bz2
scummvm-rg350-6426833420d3beb4137d654c507386394b3e4e74.zip
CMI cannon hack
svn-id: r6350
-rw-r--r--scumm/script_v8.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 8f426e4834..84795777ca 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1520,6 +1520,13 @@ void Scumm_v8::o8_getActorChore()
Actor *a = derefActorSafe(actnum, "o8_getActorChore");
assert(a);
+ // FIXME: This is a hack for the cannon scene, as something isn't quite right
+ // here yet..
+ if ((_roomResource == 10) && (vm.slot[_currentScript].number == 2021)) {
+ push(11);
+ return;
+ }
+
push(a->frame);
}