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

[lordhoto at users.sourceforge.net]

Revision: 31165
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31165&view=rev
Author:   lordhoto
Date:     2008-03-17 15:32:30 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
- Fixed opcode 115 (fixed dragon scene)
- renamed opcode 155 to o2_addToSceneAnimPosAndUpdate

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.h
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h	2008-03-17 21:56:37 UTC (rev 31164)
+++ scummvm/trunk/engines/kyra/kyra_v2.h	2008-03-17 22:32:30 UTC (rev 31165)
@@ -1018,7 +1018,7 @@
 	int o2_setSpecialSceneScriptRunTime(ScriptState *script);
 	int o2_defineSceneAnim(ScriptState *script);
 	int o2_updateSceneAnim(ScriptState *script);
-	int o2_setSceneAnimPosAndUpdate(ScriptState *script);
+	int o2_addToSceneAnimPosAndUpdate(ScriptState *script);
 	int o2_useItemOnMainChar(ScriptState *script);
 	int o2_startDialogue(ScriptState *script);
 	int o2_zanthRandomChat(ScriptState *script);

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-17 21:56:37 UTC (rev 31164)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-17 22:32:30 UTC (rev 31165)
@@ -864,14 +864,14 @@
 	return 0;
 }
 
-int KyraEngine_v2::o2_setSceneAnimPosAndUpdate(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSceneAnimPosAndUpdate(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_v2::o2_addToSceneAnimPosAndUpdate(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addToSceneAnimPosAndUpdate(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	const int anim = stackPos(0);
-	_sceneAnims[anim].x2 = stackPos(1);
-	_sceneAnims[anim].y2 = stackPos(2);
+	_sceneAnims[anim].x2 += stackPos(1);
+	_sceneAnims[anim].y2 += stackPos(2);
 	if (_sceneAnims[anim].flags & 2) {
-		_sceneAnims[anim].x = stackPos(1);
-		_sceneAnims[anim].y = stackPos(2);
+		_sceneAnims[anim].x += stackPos(1);
+		_sceneAnims[anim].y += stackPos(2);
 	}
 	updateSceneAnim(anim, stackPos(3));
 	_specialSceneScriptRunFlag = false;
@@ -1531,7 +1531,7 @@
 		Opcode(o2_defineSceneAnim),
 		Opcode(o2_updateSceneAnim),
 		Opcode(o2_updateSceneAnim),
-		Opcode(o2_setSceneAnimPosAndUpdate),
+		Opcode(o2_addToSceneAnimPosAndUpdate),
 		// 0x74
 		Opcode(o2_useItemOnMainChar),
 		Opcode(o2_startDialogue),


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