[Scummvm-cvs-logs] scummvm master -> 02dd8cffcc9e649c1cfc5bbcb5d2517c63f6f321

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
02dd8cffcc SCI: move SCI32 plane clear to gamestate_restore()


Commit: 02dd8cffcc9e649c1cfc5bbcb5d2517c63f6f321
    https://github.com/scummvm/scummvm/commit/02dd8cffcc9e649c1cfc5bbcb5d2517c63f6f321
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-04-27T20:50:37+02:00

Commit Message:
SCI: move SCI32 plane clear to gamestate_restore()

Changed paths:
    engines/sci/engine/savegame.cpp



diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 3d93441..8fca7ea 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -134,13 +134,6 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
 
 		// Reset _scriptSegMap, to be restored below
 		_scriptSegMap.clear();
-
-#ifdef ENABLE_SCI32
-		// Clear any planes/screen items currently showing so they
-		// don't show up after the load.
-		if (getSciVersion() >= SCI_VERSION_2)
-			g_sci->_gfxFrameout->clear();
-#endif
 	}
 
 	s.skip(4, VER(14), VER(18));		// OBSOLETE: Used to be _exportsAreWide
@@ -926,14 +919,17 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 
 	// reset ports is one of the first things we do, because that may free() some hunk memory
 	//  and we don't want to do that after we read in the saved game hunk memory
-	if (ser.isLoading()) {
-		// reset ports
-		if (g_sci->_gfxPorts)
-			g_sci->_gfxPorts->reset();
-		// clear screen
-		if (g_sci->_gfxScreen)
-			g_sci->_gfxScreen->clear();
-	}
+	if (g_sci->_gfxPorts)
+		g_sci->_gfxPorts->reset();
+	// clear screen
+	if (g_sci->_gfxScreen)
+		g_sci->_gfxScreen->clear();
+#ifdef ENABLE_SCI32
+	// Also clear any SCI32 planes/screen items currently showing so they
+	// don't show up after the load.
+	if (getSciVersion() >= SCI_VERSION_2)
+		g_sci->_gfxFrameout->clear();
+#endif
 
 	s->reset(true);
 	s->saveLoadWithSerializer(ser);	// FIXME: Error handling?