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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Jan 31 02:15:05 CET 2010


Revision: 47734
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47734&view=rev
Author:   thebluegr
Date:     2010-01-31 01:15:05 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Removed an unused parameter from _game_run()

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

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-31 00:47:29 UTC (rev 47733)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-31 01:15:05 UTC (rev 47734)
@@ -1957,7 +1957,7 @@
 	s->stack_base[1] = NULL_REG;
 }
 
-static EngineState *_game_run(EngineState *&s, int restoring) {
+static EngineState *_game_run(EngineState *&s) {
 	EngineState *successor = NULL;
 	int game_is_finished = 0;
 
@@ -1966,7 +1966,7 @@
 
 	do {
 		s->_executionStackPosChanged = false;
-		run_vm(s, (successor || restoring) ? 1 : 0);
+		run_vm(s, successor ? 1 : 0);
 		if (s->restarting_flags & SCI_GAME_IS_RESTARTING_NOW) { // Restart was requested?
 			successor = NULL;
 			s->_executionStack.clear();
@@ -2025,7 +2025,7 @@
 		return 1;
 	}
 	// and ENGAGE!
-	_game_run(*_s, 0);
+	_game_run(*_s);
 
 	debugC(2, kDebugLevelVM, "Game::play() finished.");
 


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