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

[m_kiewitz at users.sourceforge.net]

Revision: 52317
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52317&view=rev
Author:   m_kiewitz
Date:     2010-08-24 08:31:57 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
SCI: bit more work on restore dialog replacing

(works now, if enabled - but music isn't yet paused)

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

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-08-24 06:25:08 UTC (rev 52316)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-08-24 08:31:57 UTC (rev 52317)
@@ -254,8 +254,8 @@
 
 	debug("Emulating SCI version %s\n", getSciVersionDesc(getSciVersion()));
 
-	// ENABLE THIS FOR REPLACING SIERRA GAME RESTORE DIALOG WITH SCUMMVM RESTORE
-	//patchGameSaveRestore(segMan);
+	// Patch in our save/restore code, so that dialogs are replaced
+	patchGameSaveRestore(segMan);
 
 	if (_gameDescription->flags & ADGF_ADDENGLISH) {
 		// if game is multilingual
@@ -347,6 +347,9 @@
 	const uint16 kernelCount = _kernel->getKernelNamesSize();
 	byte kernelIdRestore = 0;
 
+	// DISABLE NEXT LINE FOR REPLACING SIERRA GAME RESTORE DIALOG WITH SCUMMVM RESTORE
+	return;
+
 	for (uint16 kernelNr = 0; kernelNr < kernelCount; kernelNr++) {
 		Common::String kernelName = _kernel->getKernelName(kernelNr);
 		if (kernelName == "RestoreGame")
@@ -521,6 +524,7 @@
 			_gamestate->_segMan->resetSegMan();
 			initGame();
 			initStackBaseWithSelector(SELECTOR(play));
+			patchGameSaveRestore(_gamestate->_segMan);
 			_gamestate->gameIsRestarting = GAMEISRESTARTING_RESTART;
 			if (_gfxMenu)
 				_gfxMenu->reset();
@@ -529,6 +533,7 @@
 			_gamestate->abortScriptProcessing = kAbortNone;
 			_gamestate->_executionStack.clear();
 			initStackBaseWithSelector(SELECTOR(replay));
+			patchGameSaveRestore(_gamestate->_segMan);
 			_gamestate->shrinkStackToBase();
 			_gamestate->abortScriptProcessing = kAbortNone;
 		} else {


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