Ticket #1791: comi_default_charset.diff
File comi_default_charset.diff, 2.6 KB (added by , 17 years ago) |
---|
-
scumm/intern.h
866 866 }; 867 867 868 868 protected: 869 int _verb Charset, _verbLineSpacing;869 int _verbLineSpacing; 870 870 bool _existLanguageFile; 871 871 char *_languageBuffer; 872 872 LangIndexNode *_languageIndex; -
scumm/scumm.cpp
819 819 #ifndef DISABLE_SCUMM_7_8 820 820 ScummEngine_v7::ScummEngine_v7(OSystem *syst, const DetectorResult &dr) 821 821 : ScummEngine_v6(syst, dr) { 822 _verbCharset = 0;823 822 _verbLineSpacing = 10; 824 823 825 824 _smushFrameRate = 0; -
scumm/saveload.cpp
1188 1188 1189 1189 const SaveLoadEntry V7Entries[] = { 1190 1190 MKLINE(ScummEngine_v7, _subtitleQueuePos, sleInt32, VER(61)), 1191 MK LINE(ScummEngine_v7, _verbCharset, sleInt32, VER(68)),1191 MK_OBSOLETE(ScummEngine_v7, _verbCharset, sleInt32, VER(68), VER(68)), 1192 1192 MKLINE(ScummEngine_v7, _verbLineSpacing, sleInt32, VER(68)), 1193 1193 MKEND() 1194 1194 }; -
scumm/script_v8.cpp
677 677 678 678 void ScummEngine_v8::o8_cursorCommand() { 679 679 byte subOp = fetchScriptByte(); 680 int a , i;680 int a; 681 681 int args[16]; 682 682 683 683 switch (subOp) { … … 725 725 setCursorTransparency(pop()); 726 726 break; 727 727 case 0xE7: // SO_CHARSET_SET 728 _ verbCharset = pop();728 _string[0]._default.charset = pop(); 729 729 break; 730 730 case 0xE8: // SO_CHARSET_COLOR 731 731 getStackList(args, ARRAYSIZE(args)); 732 for (i = 0; i < 16; i++)733 _charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];734 732 break; 735 733 case 0xE9: // SO_CURSOR_PUT 736 734 { … … 1089 1087 vs->hicolor = 0; 1090 1088 vs->dimcolor = 8; 1091 1089 vs->type = kTextVerbType; 1092 vs->charset_nr = _ verbCharset;1090 vs->charset_nr = _string[0]._default.charset; 1093 1091 vs->curmode = 0; 1094 1092 vs->saveid = 0; 1095 1093 vs->key = 0; -
scumm/saveload.h
47 47 * only saves/loads those which are valid for the version of the savegame 48 48 * which is being loaded/saved currently. 49 49 */ 50 #define CURRENT_VER 6 850 #define CURRENT_VER 69 51 51 52 52 /** 53 53 * An auxillary macro, used to specify savegame versions. We use this instead