From 72484b204b85f1d25c01e0f0afc757d9a3c646b9 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 27 Mar 2008 23:53:49 +0000
Subject: - Implemented opcodes:   -> 51: o2_getElapsedSecs   -> 52:
 o2_getTimerDelay - Added warnings to o2_delaySecs and o2_delay for
 unimplemented subfunctions

svn-id: r31277
---
 engines/kyra/kyra_v2.h     |  2 ++
 engines/kyra/script_v2.cpp | 23 ++++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 67d363074d..5d57c4ca66 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -995,6 +995,8 @@ protected:
 	int o2_setMousePos(ScriptState *script);
 	int o2_showMouse(ScriptState *script);
 	int o2_wipeDownMouseItem(ScriptState *script);
+	int o2_getElapsedSecs(ScriptState *script);
+	int o2_getTimerDelay(ScriptState *script);
 	//int o2_playSoundEffect(ScriptState *script);
 	int o2_delaySecs(ScriptState *script);
 	int o2_delay(ScriptState *script);
diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp
index 52a2f534a7..ac0a7e955f 100644
--- a/engines/kyra/script_v2.cpp
+++ b/engines/kyra/script_v2.cpp
@@ -593,14 +593,31 @@ int KyraEngine_v2::o2_wipeDownMouseItem(ScriptState *script) {
 	return 0;
 }
 
+int KyraEngine_v2::o2_getElapsedSecs(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getElapsedSecs(%p) ()", (const void *)script);
+	return _system->getMillis() / 1000;
+}
+
+int KyraEngine_v2::o2_getTimerDelay(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getTimerDelay(%p) (%d)", (const void *)script, stackPos(0));
+	return _timer->getDelay(stackPos(0));
+}
+
 int KyraEngine_v2::o2_delaySecs(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_delaySecs(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-	delay(stackPos(0) * 1000, true);
+	if (stackPos(1))
+		warning("unimplemented o2_delaySecs subfunction");
+	//if (stackPos(1))
+	//	sub_27100(stackPos(0) * _tickLength);
+	//else
+		delay(stackPos(0) * 1000, true);
 	return 0;
 }
 
 int KyraEngine_v2::o2_delay(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_delay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+	if (stackPos(1))
+		warning("unimplemented o2_delay subfunction");
 	//if (stackPos(1))
 	//	sub_27100(stackPos(0) * _tickLength);
 	//else
@@ -1780,9 +1797,9 @@ void KyraEngine_v2::setupOpcodeTable() {
 		Opcode(o2_showMouse),
 		OpcodeUnImpl(),
 		Opcode(o2_wipeDownMouseItem),
-		OpcodeUnImpl(),
+		Opcode(o2_getElapsedSecs),
 		// 0x34
-		OpcodeUnImpl(),
+		Opcode(o2_getTimerDelay),
 		Opcode(o2_playSoundEffect),
 		Opcode(o2_delaySecs),
 		Opcode(o2_delay),
-- 
cgit v1.2.3