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

[thebluegr at users.sourceforge.net]

Revision: 51309
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51309&view=rev
Author:   thebluegr
Date:     2010-07-26 13:40:07 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
SCI: Fixed menu reset in SCI0/SCI01 games when restarting

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

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-07-26 12:20:07 UTC (rev 51308)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-07-26 13:40:07 UTC (rev 51309)
@@ -277,10 +277,6 @@
 	}
 
 	_gamestate->initGlobals();
-
-	if (_gamestate->abortScriptProcessing == kAbortRestartGame && _gfxMenu)
-		_gfxMenu->reset();
-
 	_gamestate->_segMan->initSysStrings();
 
 	_gamestate->r_acc = _gamestate->r_prev = NULL_REG;
@@ -415,16 +411,19 @@
 		exitGame();
 
 		if (_gamestate->abortScriptProcessing == kAbortRestartGame) {
-			_gamestate->abortScriptProcessing = kAbortNone;
 			_gamestate->_segMan->resetSegMan();
 			initGame();
 			initStackBaseWithSelector(SELECTOR(play));
 			_gamestate->gameWasRestarted = true;
+			if (_gfxMenu)
+				_gfxMenu->reset();
+			_gamestate->abortScriptProcessing = kAbortNone;
 		} else if (_gamestate->abortScriptProcessing == kAbortLoadGame) {
 			_gamestate->abortScriptProcessing = kAbortNone;
 			_gamestate->_executionStack.clear();
 			initStackBaseWithSelector(SELECTOR(replay));
 			_gamestate->shrinkStackToBase();
+			_gamestate->abortScriptProcessing = kAbortNone;
 		} else {
 			break;	// exit loop
 		}


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