Ticket #3194: 1722153-2.diff

scumm/charset.h

@@ -25 +25 @@
 #include "common/scummsys.h"
 #include "common/rect.h"
 #include "scumm/gfx.h"
+#include "scumm/saveload.h"
 
 namespace Scumm {
 
@@ -84 +85 @@
         virtual int getCharWidth(byte chr) = 0;
 
         virtual void setColor(byte color) { _color = color; translateColor(); }
+
+        void saveLoadWithSerializer(Serializer *ser);
 };
 
 class CharsetRendererCommon : public CharsetRenderer {

scumm/charset.cpp

@@ -1311 +1311 @@
         }
 }
 
+void CharsetRenderer::saveLoadWithSerializer(Serializer *ser) {
+        static const SaveLoadEntry charsetRendererEntries[] = {
+                MKLINE(CharsetRenderer, _curId, sleByte, VER(73)),
+                MKLINE(CharsetRenderer, _color, sleByte, VER(73)),
+                MKEND()
+        };
 
+        ser->saveLoadEntries(this, charsetRendererEntries);
+
+        if (ser->isLoading()) {
+                setCurID(_curId);
+                setColor(_color);
+        }
+}
+
 void CharsetRendererClassic::printChar(int chr, bool ignoreCharsetMask) {
         int width, height, origWidth, origHeight;
         int offsX, offsY;

scumm/saveload.cpp

@@ -1156 +1156 @@
         //
         // Save/load the charset renderer state
         //
-        if (s->getVersion() >= VER(72)) {
-                if (s->isSaving()) {
-                        s->saveByte(_charset->getCurID());
+        if (s->getVersion() >= VER(73)) {
+                _charset->saveLoadWithSerializer(s);
+        } else if (s->isLoading()) {
+                if (s->getVersion() == VER(72)) {
+                        _charset->setCurID(s->loadByte());
                 } else {
-                        _charset->setCurID(s->loadByte());
+                        // 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);
                 }
         }
 }

scumm/saveload.h

@@ -47 +47 @@
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 72
+#define CURRENT_VER 73
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead