From bd67214c96c1bb1b194cfc31abf05a08afc9cf64 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 28 May 2007 08:02:10 +0000
Subject: Improved version of patch to fix bug #1722153: "FT: Error on loading
 a game saved during a dialogue"

svn-id: r26987
---
 engines/scumm/saveload.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'engines/scumm/saveload.cpp')

diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 242b7c9f51..16f6b012fc 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1156,11 +1156,16 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 	//
 	// Save/load the charset renderer state
 	//
-	if (s->getVersion() >= VER(72)) {
-		if (s->isSaving()) {
-			s->saveByte(_charset->getCurID());
-		} else {
+	if (s->getVersion() >= VER(73)) {
+		_charset->saveLoadWithSerializer(s);
+	} else if (s->isLoading()) {
+		if (s->getVersion() == VER(72)) {
 			_charset->setCurID(s->loadByte());
+		} else {
+			// Before V72, the charset id wasn't saved. This used to cause issues such
+			// as the one described in the bug report #1722153. For these savegames,
+			// we reinitialize the id using a, hopefully, sane value.
+			_charset->setCurID(_string[0]._default.charset);
 		}
 	}
 }
-- 
cgit v1.2.3


From 218e132e37017b64a61cce53c5dd26267a81784a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 30 May 2007 21:56:52 +0000
Subject: Updated legal headers in source files, based on what Pidgin (the IM
 client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file;
 updated copyright dates in a few spots

svn-id: r27024
---
 engines/scumm/saveload.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines/scumm/saveload.cpp')

diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 16f6b012fc..9578b05c1f 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1,6 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
-- 
cgit v1.2.3