aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-05-04 00:41:52 +0000
committerMax Horn2003-05-04 00:41:52 +0000
commit7a2de47ce375690d85ef327aa21ef88e052fd459 (patch)
treebe1146f74cb52b26d359251ae6a25ae30e69ef2f /scumm
parent0ce5658d669ba6574fff7254ccb508a38b473ae1 (diff)
downloadscummvm-rg350-7a2de47ce375690d85ef327aa21ef88e052fd459.tar.gz
scummvm-rg350-7a2de47ce375690d85ef327aa21ef88e052fd459.tar.bz2
scummvm-rg350-7a2de47ce375690d85ef327aa21ef88e052fd459.zip
fixed o2_delay
svn-id: r7298
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v2.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 0def310502..a216533c4e 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -1041,6 +1041,17 @@ void Scumm_v2::o2_delayVariable() {
o5_breakHere();
}
+void Scumm_v2::o2_delay() {
+ int delay = fetchScriptByte();
+ delay |= fetchScriptByte() << 8;
+ delay |= fetchScriptByte() << 16;
+ delay = 0xFFFFFF - delay;
+
+ vm.slot[_currentScript].delay = delay;
+ vm.slot[_currentScript].status = 1;
+ o5_breakHere();
+}
+
void Scumm_v2::o2_matrixOps() {
int a, b;
@@ -1174,18 +1185,6 @@ 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);
-}
-
void Scumm_v2::o2_dummy() {
warning("o2_dummy invoked (opcode %d)", _opcode);
}