thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r25249
This commit is contained in:
Max Horn 2007-01-28 18:47:10 +00:00
parent 06c3d2cb2a
commit e287f181ed
4 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/scumm/intern.h
View file

@ -866,7 +866,7 @@ public:
}; };
protected: protected:
int _verbCharset, _verbLineSpacing; int _verbLineSpacing;
bool _existLanguageFile; bool _existLanguageFile;
char *_languageBuffer; char *_languageBuffer;
LangIndexNode *_languageIndex; LangIndexNode *_languageIndex;

2
engines/scumm/saveload.cpp
View file

@ -1188,7 +1188,7 @@ void ScummEngine_v7::saveOrLoad(Serializer *s) {
const SaveLoadEntry V7Entries[] = { const SaveLoadEntry V7Entries[] = {
MKLINE(ScummEngine_v7, _subtitleQueuePos, sleInt32, VER(61)), 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)), MKLINE(ScummEngine_v7, _verbLineSpacing, sleInt32, VER(68)),
MKEND() MKEND()
}; };

2
engines/scumm/saveload.h
View file

@ -47,7 +47,7 @@ namespace Scumm {
* only saves/loads those which are valid for the version of the savegame * only saves/loads those which are valid for the version of the savegame
* which is being loaded/saved currently. * 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 * An auxillary macro, used to specify savegame versions. We use this instead

1
engines/scumm/scumm.cpp
View file

@ -819,7 +819,6 @@ void ScummEngine_vCUPhe::parseEvents() {
#ifndef DISABLE_SCUMM_7_8 #ifndef DISABLE_SCUMM_7_8
ScummEngine_v7::ScummEngine_v7(OSystem *syst, const DetectorResult &dr) ScummEngine_v7::ScummEngine_v7(OSystem *syst, const DetectorResult &dr)
: ScummEngine_v6(syst, dr) { : ScummEngine_v6(syst, dr) {
_verbCharset = 0;
_verbLineSpacing = 10; _verbLineSpacing = 10;
_smushFrameRate = 0; _smushFrameRate = 0;