[Scummvm-cvs-logs] SF.net SVN: scummvm: [25184] scummvm/trunk/engines/kyra/plugin.cpp

[lordhoto at users.sourceforge.net]

Revision: 25184
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25184&view=rev
Author:   lordhoto
Date:     2007-01-25 03:26:13 -0800 (Thu, 25 Jan 2007)

Log Message:
-----------
Adding language/platform overwriting removed in r25170 (by accident?)

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/plugin.cpp

Modified: scummvm/trunk/engines/kyra/plugin.cpp
===================================================================
--- scummvm/trunk/engines/kyra/plugin.cpp	2007-01-25 10:27:24 UTC (rev 25183)
+++ scummvm/trunk/engines/kyra/plugin.cpp	2007-01-25 11:26:13 UTC (rev 25184)
@@ -119,7 +119,21 @@
 	}
 
 	GameFlags flags = adGameDescs[id].flags;
+	
+	Platform platform = parsePlatform(ConfMan.get("platform"));
+	if (platform != kPlatformUnknown) {
+		flags.platform = platform;
+	}
 
+	if (flags.lang == UNK_LANG) {
+		Language lang = parseLanguage(ConfMan.get("language"));
+		if (lang != UNK_LANG) {
+			flags.lang = lang;
+		} else {
+			flags.lang = EN_ANY;
+		}
+	}
+
 	if (!scumm_stricmp("kyra1", gameid)) {
 		*engine = new KyraEngine_v1(syst, flags);
 	} else if (!scumm_stricmp("kyra2", gameid)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.