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

[lordhoto at users.sourceforge.net]

Revision: 31722
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31722&view=rev
Author:   lordhoto
Date:     2008-04-25 08:46:07 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
Implmented opcodes:
 - 11: o3_getCharacterFrameFromFacing
 - 12: o3_setCharacterFacingOverwrite

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 15:41:06 UTC (rev 31721)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-25 15:46:07 UTC (rev 31722)
@@ -674,6 +674,8 @@
 	int o3_getCharacterFacing(ScriptState *script);
 	int o3_getCharacterScene(ScriptState *script);
 	int o3_getMalcolmsMood(ScriptState *script);
+	int o3_getCharacterFrameFromFacing(ScriptState *script);
+	int o3_setCharacterFacingOverwrite(ScriptState *script);
 	int o3_trySceneChange(ScriptState *script);
 	int o3_moveCharacter(ScriptState *script);
 	int o3_setCharacterFacing(ScriptState *script);

Modified: scummvm/trunk/engines/kyra/script_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-25 15:41:06 UTC (rev 31721)
+++ scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-25 15:46:07 UTC (rev 31722)
@@ -113,6 +113,18 @@
 	return _malcolmsMood;
 }
 
+int KyraEngine_v3::o3_getCharacterFrameFromFacing(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_getCharacterFrameFromFacing(%p) ()", (const void *)script);
+	return _characterFrameTable[_mainCharacter.facing];
+}
+
+int KyraEngine_v3::o3_setCharacterFacingOverwrite(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_setCharacterFacingOverwrite(%p) (%d)", (const void *)script, stackPos(0));
+	_mainCharacter.facing = stackPos(0);
+	_overwriteSceneFacing = true;
+	return 0;
+}
+
 int KyraEngine_v3::o3_trySceneChange(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_trySceneChange(%p) (%d, %d, %d, %d)", (const void *)script,
 			stackPos(0), stackPos(1), stackPos(2), stackPos(3));
@@ -1125,9 +1137,9 @@
 	Opcode(o3_getMalcolmsMood);
 	Opcode(o3_dummy);
 	Opcode(o3_dummy);
-	OpcodeUnImpl();
+	Opcode(o3_getCharacterFrameFromFacing);
 	// 0x0c
-	OpcodeUnImpl();
+	Opcode(o3_setCharacterFacingOverwrite);
 	Opcode(o3_trySceneChange);
 	Opcode(o3_moveCharacter);
 	Opcode(o3_setCharacterFacing);


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