aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorJames Brown2003-05-03 15:08:10 +0000
committerJames Brown2003-05-03 15:08:10 +0000
commitf51b4387d1e44942bd10d3ebd2dd6faf28a728c1 (patch)
tree7d98d96b05ed138d38b19628dd01918171db46a6 /scumm/script_v2.cpp
parentb7a3f481a865cf09e2a6cd0a9dc06304a3341679 (diff)
downloadscummvm-rg350-f51b4387d1e44942bd10d3ebd2dd6faf28a728c1.tar.gz
scummvm-rg350-f51b4387d1e44942bd10d3ebd2dd6faf28a728c1.tar.bz2
scummvm-rg350-f51b4387d1e44942bd10d3ebd2dd6faf28a728c1.zip
hack around v2 o2_delay problem
svn-id: r7284
Diffstat (limited to 'scumm/script_v2.cpp')
-rw-r--r--scumm/script_v2.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index ff2007b4c3..007b8a2bdd 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -90,7 +90,7 @@ void Scumm_v2::setupOpcodes() {
/* 2C */
OPCODE(o2_assignVarByte),
OPCODE(o5_putActorInRoom),
- OPCODE(o5_delay),
+ OPCODE(o2_delay),
OPCODE(o2_ifNotState04),
/* 30 */
OPCODE(o2_matrixOps),
@@ -1150,3 +1150,16 @@ void Scumm_v2::o2_getActorWalkBox() {
void Scumm_v2::o2_drawSentence() {
warning("TODO o2_drawSentence()");
}
+
+void Scumm_v2::o2_delay() {
+ int delay = fetchScriptByte();
+ delay |= fetchScriptByte() << 8;
+ delay |= fetchScriptByte() << 16;
+
+ vm.slot[_currentScript].delay = 1; // FIXME: Fix conversion
+ vm.slot[_currentScript].status = 1;
+ o5_breakHere();
+
+ warning("TODO: o2_delay(%d)", delay);
+}
+