about summary refs log tree commit diff
path: root/src/game/client/gameclient.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2009-06-15 08:15:53 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2009-06-15 08:15:53 +0000
commit307cf4aa64b37aa46e14cde09b38a0a4a73330be (patch)
tree6268ff35ccde600d4ba6111ac5ba8404681c3489 /src/game/client/gameclient.cpp
parentab171f8f303306f5b45e2ccaa4c47404b11b0256 (diff)
downloadzcatch-307cf4aa64b37aa46e14cde09b38a0a4a73330be.tar.gz
zcatch-307cf4aa64b37aa46e14cde09b38a0a4a73330be.zip
done language selector
Diffstat (limited to 'src/game/client/gameclient.cpp')
-rw-r--r--src/game/client/gameclient.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index 752af7cd..fc17b94f 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -229,9 +229,6 @@ void GAMECLIENT::on_console_init()
 	input.add(controls);
 	input.add(binds);
 	
-	//	
-	MACRO_REGISTER_COMMAND("language", "s", CFGFLAG_CLIENT, con_language, this, "Sets the language");
-	
 	// add the some console commands
 	MACRO_REGISTER_COMMAND("team", "i", CFGFLAG_CLIENT, con_team, this, "Switch team");
 	MACRO_REGISTER_COMMAND("kill", "", CFGFLAG_CLIENT, con_kill, this, "Kill yourself");
@@ -258,6 +255,9 @@ void GAMECLIENT::on_console_init()
 
 void GAMECLIENT::on_init()
 {
+	// set the language
+	localization.load(config.cl_languagefile);
+	
 	// init all components
 	for(int i = 0; i < all.num; i++)
 		all.components[i]->on_init();
@@ -954,10 +954,3 @@ void GAMECLIENT::con_kill(void *result, void *user_data)
 {
 	((GAMECLIENT*)user_data)->send_kill(-1);
 }
-
-void GAMECLIENT::con_language(void *result, void *user_data)
-{
-	char buf[128];
-	str_format(buf, sizeof(buf), "data/languages/%s.txt", console_arg_string(result, 0));
-	localization.load(buf);
-}