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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon May 12 15:19:11 CEST 2008


Revision: 32057
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32057&view=rev
Author:   lordhoto
Date:     2008-05-12 06:19:11 -0700 (Mon, 12 May 2008)

Log Message:
-----------
Two more KyraEngine_LoK opcodes renamed.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_lok.h
    scummvm/trunk/engines/kyra/script_lok.cpp

Modified: scummvm/trunk/engines/kyra/kyra_lok.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.h	2008-05-12 13:11:42 UTC (rev 32056)
+++ scummvm/trunk/engines/kyra/kyra_lok.h	2008-05-12 13:19:11 UTC (rev 32057)
@@ -654,7 +654,7 @@
 	// Opcodes
 	int o1_magicInMouseItem(EMCState *script);
 	int o1_characterSays(EMCState *script);
-	int o1_pauseTicks(EMCState *script);
+	int o1_delay(EMCState *script);
 	int o1_drawSceneAnimShape(EMCState *script);
 	int o1_runNPCScript(EMCState *script);
 	int o1_setSpecialExitList(EMCState *script);
@@ -676,7 +676,7 @@
 	int o1_setBirthstoneGem(EMCState *script);
 	int o1_placeItemInGenericMapScene(EMCState *script);
 	int o1_setBrandonStatusBit(EMCState *script);
-	int o1_pauseSeconds(EMCState *script);
+	int o1_delaySecs(EMCState *script);
 	int o1_getCharacterScene(EMCState *script);
 	int o1_runNPCSubscript(EMCState *script);
 	int o1_magicOutMouseItem(EMCState *script);

Modified: scummvm/trunk/engines/kyra/script_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lok.cpp	2008-05-12 13:11:42 UTC (rev 32056)
+++ scummvm/trunk/engines/kyra/script_lok.cpp	2008-05-12 13:19:11 UTC (rev 32057)
@@ -74,10 +74,10 @@
 	return 0;
 }
 
-int KyraEngine_LoK::o1_pauseTicks(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseTicks(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_delay(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_delay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	if (stackPos(1)) {
-		warning("STUB: special o1_pauseTicks");
+		warning("STUB: special o1_delay");
 		// delete this after correct implementing
 		delayWithTicks(stackPos(0));
 	} else {
@@ -319,8 +319,8 @@
 	return 0;
 }
 
-int KyraEngine_LoK::o1_pauseSeconds(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseSeconds(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_delaySecs(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_delaySecs(%p) (%d)", (const void *)script, stackPos(0));
 	if (stackPos(0) > 0 && !_skipFlag)
 		delay(stackPos(0)*1000, true);
 	_skipFlag = false;
@@ -1691,7 +1691,7 @@
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseMusicSeconds(%p) ()", (const void *)script);
 	// if music disabled
 	//     return
-	o1_pauseSeconds(script);
+	o1_delaySecs(script);
 	return 0;
 }
 
@@ -1735,7 +1735,7 @@
 	// 0x00
 	Opcode(o1_magicInMouseItem);
 	Opcode(o1_characterSays);
-	Opcode(o1_pauseTicks);
+	Opcode(o1_delay);
 	Opcode(o1_drawSceneAnimShape);
 	// 0x04
 	Opcode(o1_queryGameFlag);
@@ -1774,7 +1774,7 @@
 	Opcode(o1_placeItemInGenericMapScene);
 	// 0x20
 	Opcode(o1_setBrandonStatusBit);
-	Opcode(o1_pauseSeconds);
+	Opcode(o1_delaySecs);
 	Opcode(o1_getCharacterScene);
 	Opcode(o1_runNPCSubscript);
 	// 0x24


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