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

[thebluegr at users.sourceforge.net]

Revision: 43913
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43913&view=rev
Author:   thebluegr
Date:     2009-09-02 23:11:50 +0000 (Wed, 02 Sep 2009)

Log Message:
-----------
Fixed loading again (broken accidentally in rev. 43504

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

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-09-02 19:33:08 UTC (rev 43912)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-09-02 23:11:50 UTC (rev 43913)
@@ -204,14 +204,7 @@
 	s.syncAsSint32LE(Nodes_seg_id);
 }
 
-static void sync_SegManagerPtr(Common::Serializer &s, SegManager *&obj) {
-	ResourceManager *resMan = 0;
-
-	if (s.isSaving()) {
-		assert(obj);
-		resMan = obj->_resMan;
-	}
-
+static void sync_SegManagerPtr(Common::Serializer &s, ResourceManager *&resMan, SegManager *&obj) {
 	s.skip(1);	// obsolete: used to be a flag indicating if we got sci11 or not
 
 	if (s.isLoading()) {
@@ -264,7 +257,7 @@
 	s.syncAsSint32LE(status_bar_foreground);
 	s.syncAsSint32LE(status_bar_background);
 
-	sync_SegManagerPtr(s, segMan);
+	sync_SegManagerPtr(s, resMan, segMan);
 
 	syncArray<Class>(s, segMan->_classtable);
 


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