From 642fa67da9c271244de373431166f23449ec8543 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Sun, 15 Apr 2007 20:36:44 +0000
Subject: Added code for decodeParseString.SO_PRINT_WRAP and rewrote the
 CHARSET_1 function in order to match the original V8 interpreter. This should
 fix bugs #1036707 and #1662610 (subtitles word wrapping issues).

svn-id: r26516
---
 engines/scumm/saveload.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 7df428529a..6d8798a1e7 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -834,6 +834,8 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 		MKLINE(StringTab, _default.overhead, sleByte, VER(8)),
 		MKLINE(StringTab, no_talk_anim, sleByte, VER(8)),
 		MKLINE(StringTab, _default.no_talk_anim, sleByte, VER(8)),
+		MKLINE(StringTab, wrapping, sleByte, VER(71)),
+		MKLINE(StringTab, _default.wrapping, sleByte, VER(71)),
 		MKEND()
 	};
 
-- 
cgit v1.2.3


From f1e29981edb66f5427d0bbada073875788ba992f Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 26 May 2007 17:39:33 +0000
Subject: Patch from bug #1722153: "FT: Error on loading a game saved during a
 dialogue"

svn-id: r26947
---
 engines/scumm/saveload.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 6d8798a1e7..242b7c9f51 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1152,6 +1152,17 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 	if (_imuse && (_saveSound || !_saveTemporaryState)) {
 		_imuse->save_or_load(s, this);
 	}
+
+	//
+	// Save/load the charset renderer state
+	//
+	if (s->getVersion() >= VER(72)) {
+		if (s->isSaving()) {
+			s->saveByte(_charset->getCurID());
+		} else {
+			_charset->setCurID(s->loadByte());
+		}
+	}
 }
 
 void ScummEngine_v0::saveOrLoad(Serializer *s) {
-- 
cgit v1.2.3