[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.82,1.83

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv32346/gui

Modified Files:
	launcher.cpp 
Log Message:
cleanup for language/platform functions

Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- launcher.cpp	21 Dec 2003 15:29:51 -0000	1.82
+++ launcher.cpp	30 Dec 2003 19:07:55 -0000	1.83
@@ -149,7 +149,7 @@
 	_langPopUp->appendEntry("<default>");
 	_langPopUp->appendEntry("");
 	const Common::LanguageDescription *l = Common::g_languages;
-	for (; l->name; ++l) {
+	for (; l->code; ++l) {
 		_langPopUp->appendEntry(l->description, l->id);
 	}
 
@@ -231,7 +231,7 @@
 
 	const Common::LanguageDescription *l = Common::g_languages;
 	int lang = Common::parseLanguage(ConfMan.get("language", _domain));
-	for (int i = 0; l->name; ++l, ++i) {
+	for (int i = 0; l->code; ++l, ++i) {
 		if (lang == l->id)
 			sel = i + 2;
 	}
@@ -257,13 +257,13 @@
 		if (lang < 0)
 			ConfMan.removeKey("language", _domain);
 		else
-			ConfMan.set("language", Common::getLanguageString(lang), _domain);
+			ConfMan.set("language", Common::getLanguageCode(lang), _domain);
 
 		Common::Platform platform = (Common::Platform)_platformPopUp->getSelectedTag();
 		if (platform < 0)
 			ConfMan.removeKey("platform", _domain);
 		else
-			ConfMan.set("platform", Common::getPlatformString(platform), _domain);
+			ConfMan.set("platform", Common::getPlatformCode(platform), _domain);
 	}
 	OptionsDialog::close();
 }
@@ -447,11 +447,11 @@
 
 			// Set language if specified
 			if (result.language != Common::UNK_LANG)
-				ConfMan.set("language", Common::getLanguageString(result.language), domain);
+				ConfMan.set("language", Common::getLanguageCode(result.language), domain);
 
 			// Set platform if specified
 			if (result.platform != Common::kPlatformUnknown)
-				ConfMan.set("platform", Common::getPlatformString(result.platform), domain);
+				ConfMan.set("platform", Common::getPlatformCode(result.platform), domain);
 
 			// Display edit dialog for the new entry
 			EditGameDialog editDialog(domain, result);