diff options
Diffstat (limited to 'engines/scumm/saveload.cpp')
| -rw-r--r-- | engines/scumm/saveload.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 242b7c9f51..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 @@ -1156,11 +1158,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); } } } |