diff options
| author | Max Horn | 2007-01-28 18:47:10 +0000 |
|---|---|---|
| committer | Max Horn | 2007-01-28 18:47:10 +0000 |
| commit | e287f181edbec10bd6ba54f713eb44acecf47b40 (patch) | |
| tree | a6975b52ff814791b44865da7ad7ef03eaf2171b | |
| parent | 06c3d2cb2a36ee6e8ba2a5d70dfa16c011ea4e41 (diff) | |
| download | scummvm-rg350-e287f181edbec10bd6ba54f713eb44acecf47b40.tar.gz scummvm-rg350-e287f181edbec10bd6ba54f713eb44acecf47b40.tar.bz2 scummvm-rg350-e287f181edbec10bd6ba54f713eb44acecf47b40.zip | |
Partial fix for bug #1036707 (made by cyx): Get rid of _verbCharset, so that we use the correct font for verbs in COMI, with the correct spacing
svn-id: r25249
| -rw-r--r-- | engines/scumm/intern.h | 2 | ||||
| -rw-r--r-- | engines/scumm/saveload.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/saveload.h | 2 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h index c99042ebc8..dbbe54cbe1 100644 --- a/engines/scumm/intern.h +++ b/engines/scumm/intern.h @@ -866,7 +866,7 @@ public: }; protected: - int _verbCharset, _verbLineSpacing; + int _verbLineSpacing; bool _existLanguageFile; char *_languageBuffer; LangIndexNode *_languageIndex; diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 2720a95ab4..72001625e3 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -1188,7 +1188,7 @@ void ScummEngine_v7::saveOrLoad(Serializer *s) { const SaveLoadEntry V7Entries[] = { MKLINE(ScummEngine_v7, _subtitleQueuePos, sleInt32, VER(61)), - MKLINE(ScummEngine_v7, _verbCharset, sleInt32, VER(68)), + MK_OBSOLETE(ScummEngine_v7, _verbCharset, sleInt32, VER(68), VER(68)), MKLINE(ScummEngine_v7, _verbLineSpacing, sleInt32, VER(68)), MKEND() }; diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 0daec2644f..e20c333f0c 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 68 +#define CURRENT_VER 69 /** * An auxillary macro, used to specify savegame versions. We use this instead diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index d510002584..986492633a 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -819,7 +819,6 @@ void ScummEngine_vCUPhe::parseEvents() { #ifndef DISABLE_SCUMM_7_8 ScummEngine_v7::ScummEngine_v7(OSystem *syst, const DetectorResult &dr) : ScummEngine_v6(syst, dr) { - _verbCharset = 0; _verbLineSpacing = 10; _smushFrameRate = 0; |