[Scummvm-cvs-logs] CVS: scummvm/gob gob.cpp,1.7,1.8 init.cpp,1.7,1.8

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Mon Apr 25 23:31:23 CEST 2005


Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2658

Modified Files:
	gob.cpp init.cpp 
Log Message:
Make it possible to specify language at run-time, since the Gobliiins 1
support for other languages appears to work at least fairly well, and this
makes it easier to test it.


Index: gob.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gob.cpp	22 Apr 2005 08:39:51 -0000	1.7
+++ gob.cpp	26 Apr 2005 06:29:53 -0000	1.8
@@ -130,7 +130,25 @@
 	snd_soundPort = 1;
 	useMouse = 1;
 	soundFlags = 0;
-	language = 5;
+
+	switch (Common::parseLanguage(ConfMan.get("language"))) {
+	case Common::FR_FRA:
+		language = 0;
+		break;
+	case Common::DE_DEU:
+		language = 1;
+		break;
+	case Common::ES_ESP:
+		language = 3;
+		break;
+	case Common::IT_ITA:
+		language = 4;
+		break;
+	default:
+		// Default to English
+		language = 2;
+		break;
+	}
 
 	return 0;
 }

Index: init.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/init.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- init.cpp	13 Apr 2005 18:27:28 -0000	1.7
+++ init.cpp	26 Apr 2005 06:29:53 -0000	1.8
@@ -174,14 +174,12 @@
 memAvail	= dword	ptr -6
 memBlocks	= word ptr -2*/
 
-	language = 5;
 	disableVideoCfg = 0x11;
 	disableMouseCfg = 0x15;
 	//reqRAMParag = 570;
 	//requiredSpace = 10;
 	strcpy(batFileName, "go");
 	init_soundVideo(1000, 1);
-	language = 2;
 
 	handle2 = data_openData("intro.stk");
 	if (handle2 >= 0) {





More information about the Scummvm-git-logs mailing list