[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.142,1.143 scummvm.cpp,2.47,2.48

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv23704

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
add ability to specify language for comi see scummvm -h for possible values

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- scumm.h	29 Jan 2003 04:38:55 -0000	1.142
+++ scumm.h	29 Jan 2003 08:07:09 -0000	1.143
@@ -160,19 +160,6 @@
 	MBS_MAX_KEY	= 0x0200
 };
 
-// possible languages for comi
-enum Languages {
-	EN_USA = 0,
-	DE_DEU = 1,
-	FR_FRA = 2,
-	IT_ITA = 3,
-	PT_BRA = 4,
-	ES_ESP = 5,
-	JA_JPN = 6,
-	ZH_TWN = 7,
-	KO_KOR = 8
-};
-
 #define _maxRooms res.num[rtRoom]
 #define _maxScripts res.num[rtScript]
 #define _maxCostumes res.num[rtCostume]
@@ -393,6 +380,7 @@
 	uint16 _debugMode, _soundCardType;
 
 	/* Not sure where this stuff goes */
+	uint16 _language;
 	byte isMaskActiveAt(int l, int t, int r, int b, byte *mem);
 	void startScene(int room, Actor *a, int b);
 	virtual void setupScummVars();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.47
retrieving revision 2.48
diff -u -d -r2.47 -r2.48
--- scummvm.cpp	26 Jan 2003 10:57:01 -0000	2.47
+++ scummvm.cpp	29 Jan 2003 08:07:10 -0000	2.48
@@ -94,6 +94,7 @@
 	_noSubtitles = detector->_noSubtitles;
 	_defaultTalkDelay = detector->_talkSpeed;
 	_use_adlib = detector->_use_adlib;
+	_language = detector->_language;
 	memset(&res, 0, sizeof(res));
 	_allocatedSize = 0;
 	_roomResource = 0;
@@ -367,6 +368,7 @@
 
 	if (_features & GF_AFTER_V8) {	// Fixme: How do we deal with non-cd installs?
 		_vars[VAR_CURRENTDISK] = 1;
+		_vars[VAR_LANGUAGE] = _language;
 	}
 }