diff options
| author | Travis Howell | 2006-02-26 06:55:56 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-02-26 06:55:56 +0000 |
| commit | a5cb12089855fc4b3c5f2770a4379612ffc83717 (patch) | |
| tree | f8e5c2abfb78df792dd20b6017a1e85703455c68 | |
| parent | 270a16b37bf02a9537b0a1c619175db55e3eb3d1 (diff) | |
| download | scummvm-rg350-a5cb12089855fc4b3c5f2770a4379612ffc83717.tar.gz scummvm-rg350-a5cb12089855fc4b3c5f2770a4379612ffc83717.tar.bz2 scummvm-rg350-a5cb12089855fc4b3c5f2770a4379612ffc83717.zip | |
COMI uses a separate setting for the verb charset, verbs use correct charset now
svn-id: r20907
| -rw-r--r-- | engines/scumm/intern.h | 1 | ||||
| -rw-r--r-- | engines/scumm/script_v8.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h index d7cb119617..89e493fca5 100644 --- a/engines/scumm/intern.h +++ b/engines/scumm/intern.h @@ -772,6 +772,7 @@ public: int32 offset; }; + int _verbCharset; bool _existLanguageFile; char *_languageBuffer; LangIndexNode *_languageIndex; diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp index b5f9f48466..b60931e1d4 100644 --- a/engines/scumm/script_v8.cpp +++ b/engines/scumm/script_v8.cpp @@ -717,9 +717,7 @@ void ScummEngine_v8::o8_cursorCommand() { setCursorTransparency(pop()); break; case 0xE7: { // SO_CHARSET_SET - int charset = pop(); - debugC(DEBUG_GENERAL, "Set userface charset to %d", charset); -// loadCharset(charset); + _verbCharset = pop(); break; } case 0xE8: // SO_CHARSET_COLOR @@ -1091,7 +1089,7 @@ void ScummEngine_v8::o8_verbOps() { vs->hicolor = 0; vs->dimcolor = 8; vs->type = kTextVerbType; - vs->charset_nr = _string[0]._default.charset; + vs->charset_nr = _verbCharset; vs->curmode = 0; vs->saveid = 0; vs->key = 0; diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index bf2dec9113..a9477dad00 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1090,6 +1090,7 @@ ScummEngine_v90he::~ScummEngine_v90he() { #ifndef DISABLE_SCUMM_7_8 ScummEngine_v7::ScummEngine_v7(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v6(detector, syst, gs, md5sum, subst) { + _verbCharset = 0; _existLanguageFile = false; _languageBuffer = NULL; _languageIndex = NULL; |