[Scummvm-cvs-logs] SF.net SVN: scummvm:[49569] scummvm/trunk/engines/sci/engine

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Jun 10 13:35:15 CEST 2010


Revision: 49569
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49569&view=rev
Author:   thebluegr
Date:     2010-06-10 11:35:15 +0000 (Thu, 10 Jun 2010)

Log Message:
-----------
Fixed regression from commit #49564

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kmovement.cpp
    scummvm/trunk/engines/sci/engine/kparse.cpp

Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp	2010-06-10 11:18:10 UTC (rev 49568)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp	2010-06-10 11:35:15 UTC (rev 49569)
@@ -464,7 +464,7 @@
 		reg_t params[2] = { make_reg(0, angle), client };
 
 		if (looper.segment) {
-			invokeSelector(s, looper, SELECTOR(doit), 2, params);
+			invokeSelector(s, looper, SELECTOR(doit), argc, argv, 2, params);
 			return s->r_acc;
 		} else {
 			// No looper? Fall back to DirLoop

Modified: scummvm/trunk/engines/sci/engine/kparse.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kparse.cpp	2010-06-10 11:18:10 UTC (rev 49568)
+++ scummvm/trunk/engines/sci/engine/kparse.cpp	2010-06-10 11:35:15 UTC (rev 49569)
@@ -118,7 +118,7 @@
 			s->r_acc = make_reg(0, 1);
 			writeSelectorValue(segMan, event, SELECTOR(claimed), 1);
 
-			invokeSelector(s, g_sci->getGameObject(), SELECTOR(syntaxFail), 2, params);
+			invokeSelector(s, g_sci->getGameObject(), SELECTOR(syntaxFail), argc, argv, 2, params);
 			/* Issue warning */
 
 			debugC(2, kDebugLevelParser, "Tree building failed");
@@ -141,7 +141,7 @@
 			debugC(2, kDebugLevelParser, "Word unknown: %s", error);
 			/* Issue warning: */
 
-			invokeSelector(s, g_sci->getGameObject(), SELECTOR(wordFail), 2, params);
+			invokeSelector(s, g_sci->getGameObject(), SELECTOR(wordFail), argc, argv, 2, params);
 			free(error);
 			return make_reg(0, 1); /* Tell them that it didn't work */
 		}


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