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

[fingolfin at users.sourceforge.net]

Revision: 50554
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50554&view=rev
Author:   fingolfin
Date:     2010-07-01 16:06:04 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
SCI: Invoke resetSegMan from SegManager::saveLoadWithSerializer, not from EngineState::saveLoadWithSerializer

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

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-07-01 16:05:47 UTC (rev 50553)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-07-01 16:06:04 UTC (rev 50554)
@@ -178,6 +178,9 @@
 }
 
 void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
+	if (s.isLoading())
+		resetSegMan();
+
 	s.skip(4, VER(9), VER(9));		// OBSOLETE: Used to be reserved_id
 	s.skip(4, VER(9), VER(18));		// OBSOLETE: Used to be _exportsAreWide
 	s.skip(4, VER(9), VER(9));		// OBSOLETE: Used to be gc_mark_bits
@@ -340,9 +343,6 @@
 
 	s.skip(1, VER(9), VER(9));	// obsolete: used to be a flag indicating if we got sci11 or not
 
-	if (s.isLoading())
-		_segMan->resetSegMan();
-
 	_segMan->saveLoadWithSerializer(s);
 
 	g_sci->_soundCmd->syncPlayList(s);


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