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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Oct 9 11:03:57 CEST 2007


Revision: 29179
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29179&view=rev
Author:   lordhoto
Date:     2007-10-09 02:03:57 -0700 (Tue, 09 Oct 2007)

Log Message:
-----------
HoF
- fixed o2_runTemporaryScript
- fixed trySceneChange, now stopping movement should work correctly

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

Modified: scummvm/trunk/engines/kyra/scene_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v2.cpp	2007-10-09 08:44:45 UTC (rev 29178)
+++ scummvm/trunk/engines/kyra/scene_v2.cpp	2007-10-09 09:03:57 UTC (rev 29179)
@@ -258,7 +258,12 @@
 		}
 		
 		if (unk1) {
-			//XXX
+			// TODO: check this again
+			int inputFlag = checkInput(0/*dword_324C5*/);
+			if (inputFlag == 198 || inputFlag == 199) {
+				running = false;
+				_unk4 = 1;
+			}
 		}
 		
 		if (!unkFlag || !running)
@@ -273,11 +278,6 @@
 		if (ret)
 			++moveTable;
 
-		// TODO: check this again
-		int inputFlag = checkInput(0/*dword_324C5*/);
-		if (inputFlag == 198 || inputFlag == 199)
-			break;
-
 		++updateType;
 		if (!updateType) {
 			update();

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2007-10-09 08:44:45 UTC (rev 29178)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2007-10-09 09:03:57 UTC (rev 29179)
@@ -470,7 +470,7 @@
 	debugC(3, kDebugLevelScriptFuncs, "o2_runTemporaryScript(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1),
 			stackPos(2), stackPos(3));
 
-	runTemporaryScript(stackPosString(0), stackPos(2) ? 1 : 0, stackPos(1), stackPos(2), stackPos(3));
+	runTemporaryScript(stackPosString(0), stackPos(3), stackPos(2) ? 1 : 0, stackPos(1), stackPos(2));
 
 	return 0;
 }


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