[Scummvm-cvs-logs] SF.net SVN: scummvm: [20907] scummvm/trunk/engines/scumm

[kirben at users.sourceforge.net]

Revision: 20907
Author:   kirben
Date:     2006-02-25 22:55:56 -0800 (Sat, 25 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20907&view=rev

Log Message:
-----------
COMI uses a separate setting for the verb charset, verbs use correct charset now

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/intern.h
    scummvm/trunk/engines/scumm/script_v8.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h	2006-02-26 06:15:13 UTC (rev 20906)
+++ scummvm/trunk/engines/scumm/intern.h	2006-02-26 06:55:56 UTC (rev 20907)
@@ -772,6 +772,7 @@
 		int32 offset;
 	};
 	
+	int _verbCharset;
 	bool _existLanguageFile;
 	char *_languageBuffer;
 	LangIndexNode *_languageIndex;

Modified: scummvm/trunk/engines/scumm/script_v8.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v8.cpp	2006-02-26 06:15:13 UTC (rev 20906)
+++ scummvm/trunk/engines/scumm/script_v8.cpp	2006-02-26 06:55:56 UTC (rev 20907)
@@ -717,9 +717,7 @@
 		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 @@
 		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;

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-02-26 06:15:13 UTC (rev 20906)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-02-26 06:55:56 UTC (rev 20907)
@@ -1090,6 +1090,7 @@
 #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;