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

[m_kiewitz at users.sourceforge.net]

Revision: 51196
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51196&view=rev
Author:   m_kiewitz
Date:     2010-07-23 08:08:27 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
SCI: some changes to kPalVary saving

still needs to get tested

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-23 07:49:02 UTC (rev 51195)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-07-23 08:08:27 UTC (rev 51196)
@@ -637,17 +637,20 @@
 		palVaryRemoveTimer();
 
 	s.syncAsSint32LE(_palVaryResourceId);
-	_palVaryOriginPalette.saveLoadWithSerializer(s);
-	_palVaryTargetPalette.saveLoadWithSerializer(s);
-	s.syncAsSint16LE(_palVaryStep);
-	s.syncAsSint16LE(_palVaryStepStop);
-	s.syncAsSint16LE(_palVaryDirection);
-	s.syncAsUint16LE(_palVaryTicks);
-	s.syncAsSint32LE(_palVaryPaused);
-	s.syncAsSint32LE(_palVarySignal);
+	if (_palVaryResourceId != -1) {
+		_palVaryOriginPalette.saveLoadWithSerializer(s);
+		_palVaryTargetPalette.saveLoadWithSerializer(s);
+		s.syncAsSint16LE(_palVaryStep);
+		s.syncAsSint16LE(_palVaryStepStop);
+		s.syncAsSint16LE(_palVaryDirection);
+		s.syncAsUint16LE(_palVaryTicks);
+		s.syncAsSint32LE(_palVaryPaused);
+	}
 
-	if (s.isLoading() && _palVaryResourceId != -1)
+	if (s.isLoading() && _palVaryResourceId != -1) {
+		_palVarySignal = 0;
 		palVaryInstallTimer();
+	}
 }
 
 void SegManager::reconstructStack(EngineState *s) {


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