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

[thebluegr at users.sourceforge.net]

Revision: 49512
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49512&view=rev
Author:   thebluegr
Date:     2010-06-08 18:23:38 +0000 (Tue, 08 Jun 2010)

Log Message:
-----------
Merged sync_SegManagerPtr() inside 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-06-08 18:17:00 UTC (rev 49511)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-06-08 18:23:38 UTC (rev 49512)
@@ -293,17 +293,7 @@
 	s.syncAsSint32LE(Nodes_seg_id);
 }
 
-static void sync_SegManagerPtr(Common::Serializer &s, SegManager *&obj) {
-	s.skip(1, VER(9), VER(9));	// obsolete: used to be a flag indicating if we got sci11 or not
 
-	if (s.isLoading())
-		obj->resetSegMan();
-
-	obj->saveLoadWithSerializer(s);
-}
-
-
-
 template <>
 void syncWithSerializer(Common::Serializer &s, Class &obj) {
 	s.syncAsSint32LE(obj.script);
@@ -381,8 +371,13 @@
 		s.syncAsSint16LE(picPortLeft);
 	}
 
-	sync_SegManagerPtr(s, _segMan);
+	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);
+
 	syncArray<Class>(s, _segMan->_classTable);
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS


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