[Scummvm-cvs-logs] scummvm master -> 31539697dc4551790f8da0b0a20f4f8008b1b1aa

clone2727 clone2727 at gmail.com
Mon Feb 14 22:04:06 CET 2011


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:
31539697dc SCI: Fix loading pre-version 28 saved games


Commit: 31539697dc4551790f8da0b0a20f4f8008b1b1aa
    https://github.com/scummvm/scummvm/commit/31539697dc4551790f8da0b0a20f4f8008b1b1aa
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-02-14T13:01:04-08:00

Commit Message:
SCI: Fix loading pre-version 28 saved games

This is a regression from a9b051beff3157e1aa8

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



diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index a59d4c0..ea56a2f 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -179,7 +179,7 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
 		mobj->saveLoadWithSerializer(s);
 
 
-		if (type == SEG_TYPE_SCRIPT && s.getVersion() >= 28) {
+		if (type == SEG_TYPE_SCRIPT) {
 			Script *scr = (Script *)mobj;
 
 			// If we are loading a script, perform some extra steps
@@ -196,7 +196,8 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
 			}
 
 			// Sync the script's string heap
-			scr->syncStringHeap(s);
+			if (s.getVersion() >= 28)
+				scr->syncStringHeap(s);
 		}
 	}
 






More information about the Scummvm-git-logs mailing list