aboutsummaryrefslogtreecommitdiff
path: root/kyra/script_v1.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2005-12-22 19:31:38 +0000
committerJohannes Schickel2005-12-22 19:31:38 +0000
commit22033482b0d47c5ed03de8e0226af4e65c85393d (patch)
treec5dba8507dd182d6baacff38384e8ba864648c76 /kyra/script_v1.cpp
parentc36104ac0ca2f350decd4622a70690f651ce7446 (diff)
downloadscummvm-rg350-22033482b0d47c5ed03de8e0226af4e65c85393d.tar.gz
scummvm-rg350-22033482b0d47c5ed03de8e0226af4e65c85393d.tar.bz2
scummvm-rg350-22033482b0d47c5ed03de8e0226af4e65c85393d.zip
Small bugfixes with enterNewScene and cmd_pauseSeconds.
Implemented opcode: cmd_setSceneFile svn-id: r19829
Diffstat (limited to 'kyra/script_v1.cpp')
-rw-r--r--kyra/script_v1.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp
index 7dbc143b08..57db9d2b96 100644
--- a/kyra/script_v1.cpp
+++ b/kyra/script_v1.cpp
@@ -577,7 +577,7 @@ int KyraEngine::cmd_setBrandonStatusBit(ScriptState *script) {
int KyraEngine::cmd_pauseSeconds(ScriptState *script) {
debug(3, "cmd_pauseSeconds(0x%X) (%d)", script, stackPos(0));
if (stackPos(0) > 0)
- delay(stackPos(0)*1000, false);
+ delay(stackPos(0)*1000, true);
return 0;
}
@@ -1393,7 +1393,8 @@ int KyraEngine::cmd_pageFlip(ScriptState *script) {
}
int KyraEngine::cmd_setSceneFile(ScriptState *script) {
- warning("STUB: cmd_setSceneFile");
+ debug(3, "cmd_setSceneFile(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+ setSceneFile(stackPos(0), stackPos(1));
return 0;
}