aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Hamm2002-03-08 20:57:09 +0000
committerVincent Hamm2002-03-08 20:57:09 +0000
commit66b8932d83fca91bebdef60498492d20f0d0c9cc (patch)
tree5596be5db0e53550d350bc24482786c721f5fd13
parentfb49fa04ba30d1cccc77ccb9d9825720fd27a1d0 (diff)
downloadscummvm-rg350-66b8932d83fca91bebdef60498492d20f0d0c9cc.tar.gz
scummvm-rg350-66b8932d83fca91bebdef60498492d20f0d0c9cc.tar.bz2
scummvm-rg350-66b8932d83fca91bebdef60498492d20f0d0c9cc.zip
Implemented multiple image blast object
svn-id: r3690
-rw-r--r--object.cpp5
-rw-r--r--script_v2.cpp2
2 files changed, 5 insertions, 2 deletions
diff --git a/object.cpp b/object.cpp
index 7db7a6e823..cbda40f2cb 100644
--- a/object.cpp
+++ b/object.cpp
@@ -1154,8 +1154,11 @@ void Scumm::drawEnqueuedObject(EnqueuedObject *eo) {
return;
}
+ if(eo->l == 0)
+ eo->l = 1;
+
assert(ptr);
- ptr = findResource(MKID('IM01'), ptr);
+ ptr = findResource(IMxx_tags[eo->l], ptr);
assert(ptr);
bomp = findResourceData(MKID('BOMP'), ptr);
diff --git a/script_v2.cpp b/script_v2.cpp
index f1d85977ff..2538fd3bf1 100644
--- a/script_v2.cpp
+++ b/script_v2.cpp
@@ -2704,7 +2704,7 @@ void Scumm::o6_kernelFunction() {
push(_objs[i].height);
break;
case 211:
- warning("o6_kernelFunction: stub211(%d)", args[1]);
+ warning("o6_kernelFunction: getInput(%d)", args[1]);
push(0);
break;
case 212: