[Scummvm-cvs-logs] SF.net SVN: scummvm: [31725] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri Apr 25 19:36:43 CEST 2008


Revision: 31725
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31725&view=rev
Author:   lordhoto
Date:     2008-04-25 10:36:43 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
Implemented opcodes:
 - 156: o3_disableTimer
 - 157: o3_enableTimer
 - 158: o3_setTimerCountdown

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v3.h
    scummvm/trunk/engines/kyra/script_v3.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v3.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-25 16:09:30 UTC (rev 31724)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-25 17:36:43 UTC (rev 31725)
@@ -743,6 +743,9 @@
 	int o3_getHiddenItemsEntry(ScriptState *script);
 	int o3_setupSceneAnimObject(ScriptState *script);
 	int o3_removeSceneAnimObject(ScriptState *script);
+	int o3_disableTimer(ScriptState *script);
+	int o3_enableTimer(ScriptState *script);
+	int o3_setTimerCountdown(ScriptState *script);
 	int o3_setVocHigh(ScriptState *script);
 	int o3_getVocHigh(ScriptState *script);
 	int o3_dummy(ScriptState *script);

Modified: scummvm/trunk/engines/kyra/script_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-25 16:09:30 UTC (rev 31724)
+++ scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-25 17:36:43 UTC (rev 31725)
@@ -27,6 +27,7 @@
 #include "kyra/script.h"
 #include "kyra/screen_v3.h"
 #include "kyra/wsamovie.h"
+#include "kyra/timer.h"
 
 #include "common/endian.h"
 
@@ -1040,6 +1041,24 @@
 	return 0;
 }
 
+int KyraEngine_v3::o3_disableTimer(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_disableTimer(%p) (%d)", (const void *)script, stackPos(0));
+	_timer->disable(stackPos(0));
+	return 0;
+}
+
+int KyraEngine_v3::o3_enableTimer(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_enableTimer(%p) (%d)", (const void *)script, stackPos(0));
+	_timer->enable(stackPos(0));
+	return 0;
+}
+
+int KyraEngine_v3::o3_setTimerCountdown(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_setTimerCountdown(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+	_timer->setCountdown(stackPos(0), stackPos(1));
+	return 0;
+}
+
 int KyraEngine_v3::o3_setVocHigh(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_setVocHigh(%p) (%d)", (const void *)script, stackPos(0));
 	_vocHigh = stackPos(0);
@@ -1319,10 +1338,10 @@
 	Opcode(o3_setupSceneAnimObject);
 	Opcode(o3_removeSceneAnimObject);
 	// 0x9c
+	Opcode(o3_disableTimer);
+	Opcode(o3_enableTimer);
+	Opcode(o3_setTimerCountdown);
 	OpcodeUnImpl();
-	OpcodeUnImpl();
-	OpcodeUnImpl();
-	OpcodeUnImpl();
 	// 0xa0
 	Opcode(o3_dummy);
 	Opcode(o3_dummy);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list