[Scummvm-cvs-logs] SF.net SVN: scummvm: [26947] scummvm/trunk/engines/scumm

[sev at users.sourceforge.net]

Revision: 26947
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26947&view=rev
Author:   sev
Date:     2007-05-26 10:39:33 -0700 (Sat, 26 May 2007)

Log Message:
-----------
Patch from bug #1722153: "FT: Error on loading a game saved during a dialogue"

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/scumm/saveload.h

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2007-05-26 17:08:33 UTC (rev 26946)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2007-05-26 17:39:33 UTC (rev 26947)
@@ -1152,6 +1152,17 @@
 	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) {

Modified: scummvm/trunk/engines/scumm/saveload.h
===================================================================
--- scummvm/trunk/engines/scumm/saveload.h	2007-05-26 17:08:33 UTC (rev 26946)
+++ scummvm/trunk/engines/scumm/saveload.h	2007-05-26 17:39:33 UTC (rev 26947)
@@ -47,7 +47,7 @@
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 71
+#define CURRENT_VER 72
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead


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