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

[thebluegr at users.sourceforge.net]

Revision: 49161
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49161&view=rev
Author:   thebluegr
Date:     2010-05-23 17:03:16 +0000 (Sun, 23 May 2010)

Log Message:
-----------
Remove the unused SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE flag

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/engine/kmisc.cpp
    scummvm/trunk/engines/sci/engine/state.h
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2010-05-23 16:59:09 UTC (rev 49160)
+++ scummvm/trunk/engines/sci/console.cpp	2010-05-23 17:03:16 UTC (rev 49161)
@@ -920,22 +920,6 @@
 }
 
 bool Console::cmdRestartGame(int argc, const char **argv) {
-	if (argc != 2) {
-		DebugPrintf("Restarts the game. There are two ways to restart a SCI game:\n");
-		DebugPrintf("%s play - calls the game object's play() method\n", argv[0]);
-		DebugPrintf("%s replay - calls the replay() methody\n", argv[0]);
-		return true;
-	}
-
-	if (!scumm_stricmp(argv[1], "play")) {
-		_engine->_gamestate->restarting_flags |= SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE;
-	} else if (!scumm_stricmp(argv[1], "replay")) {
-		_engine->_gamestate->restarting_flags &= ~SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE;
-	} else {
-		DebugPrintf("Invalid usage of %s\n", argv[0]);
-		return true;
-	}
-
 	_engine->_gamestate->restarting_flags |= SCI_GAME_IS_RESTARTING_NOW;
 	script_abort_flag = 1;
 

Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp	2010-05-23 16:59:09 UTC (rev 49160)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp	2010-05-23 17:03:16 UTC (rev 49161)
@@ -37,7 +37,6 @@
 
 reg_t kRestartGame(EngineState *s, int argc, reg_t *argv) {
 	s->restarting_flags |= SCI_GAME_IS_RESTARTING_NOW;
-	s->restarting_flags &= ~SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE; // This appears to help
 
 	s->shrinkStackToBase();
 

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2010-05-23 16:59:09 UTC (rev 49160)
+++ scummvm/trunk/engines/sci/engine/state.h	2010-05-23 17:03:16 UTC (rev 49161)
@@ -76,8 +76,7 @@
 enum {
 	SCI_GAME_IS_NOT_RESTARTING = 0,
 	SCI_GAME_WAS_RESTARTED = 1,
-	SCI_GAME_IS_RESTARTING_NOW = 2,
-	SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE = 4
+	SCI_GAME_IS_RESTARTING_NOW = 2
 };
 
 class FileHandle {

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-05-23 16:59:09 UTC (rev 49160)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-05-23 17:03:16 UTC (rev 49161)
@@ -1701,7 +1701,7 @@
 			send_selector(s, s->_gameObj, s->_gameObj, s->stack_base, 2, s->stack_base);
 
 			script_abort_flag = 0;
-			s->restarting_flags = SCI_GAME_WAS_RESTARTED | SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE;
+			s->restarting_flags = SCI_GAME_WAS_RESTARTED;
 
 		} else {
 			successor = s->successor;


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