aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2007-05-26 17:39:33 +0000
committerEugene Sandulenko2007-05-26 17:39:33 +0000
commitf1e29981edb66f5427d0bbada073875788ba992f (patch)
treec46f5425d8279f23e23912f9fb0872ccf880079f /engines
parentcc24af3671418deb49de795fe5f59ab53d60c3f0 (diff)
downloadscummvm-rg350-f1e29981edb66f5427d0bbada073875788ba992f.tar.gz
scummvm-rg350-f1e29981edb66f5427d0bbada073875788ba992f.tar.bz2
scummvm-rg350-f1e29981edb66f5427d0bbada073875788ba992f.zip
Patch from bug #1722153: "FT: Error on loading a game saved during a dialogue"
svn-id: r26947
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/saveload.cpp11
-rw-r--r--engines/scumm/saveload.h2
2 files changed, 12 insertions, 1 deletions
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) {
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index dbbf9a8a09..0c4bc14001 100644
--- a/engines/scumm/saveload.h
+++ b/engines/scumm/saveload.h
@@ -47,7 +47,7 @@ namespace Scumm {
* 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