X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fmenu.qc;h=71cc021b5ae9cb239afec9395a46e3e2c3f43922;hp=7bec34ea0b0a1ff91aad1c9ed91d051f34ca7fc9;hb=cf07e9b7c498de0ccadacf6c0892431b1009674e;hpb=24c0e211b8a839afe6bb5fc5c603d450a72b9160

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 7bec34ea0b..71cc021b5a 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -21,11 +21,12 @@ void SUB_Null() { };
 void() m_init =
 {
 	cvar_set("_menu_alpha", "0");
+	prvm_language = strzone(cvar_string("prvm_language"));
 
 	check_unacceptable_compiler_bugs();
 
 #ifdef WATERMARK
-	print("^4MQC Build information: ", WATERMARK(), "\n");
+	print(sprintf(_("^4MQC Build information: %s\n"), WATERMARK()));
 #endif
 
 	// list all game dirs (TEST)
@@ -38,7 +39,7 @@ void() m_init =
 			s = getgamedirinfo(i, GETGAMEDIRINFO_NAME);
 			if not(s)
 				break;
-			print(s, ": ", getgamedirinfo(i, GETGAMEDIRINFO_DESCRIPTION));
+			dprint(s, ": ", getgamedirinfo(i, GETGAMEDIRINFO_DESCRIPTION));
 		}
 	}
 }
@@ -115,18 +116,18 @@ void() m_init_delayed =
 	if(cvar_string("menu_skin") != "")
 	{
 		draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin"));
-		fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
+		fh = fopen(language_filename(strcat(draw_currentSkin, "/skinvalues.txt")), FILE_READ);
 	}
 	if(fh < 0)
 	if(cvar_defstring("menu_skin") != "")
 	{
 		draw_currentSkin = strcat("gfx/menu/", cvar_defstring("menu_skin"));
-		fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
+		fh = fopen(language_filename(strcat(draw_currentSkin, "/skinvalues.txt")), FILE_READ);
 	}
 	if(fh < 0)
 	{
 		draw_currentSkin = "gfx/menu/default";
-		fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
+		fh = fopen(language_filename(strcat(draw_currentSkin, "/skinvalues.txt")), FILE_READ);
 	}
 	draw_currentSkin = strzone(draw_currentSkin);
 	while((s = fgets(fh)))
@@ -183,7 +184,7 @@ void(float key, float ascii) m_keyup =
 		if(mouseButtonsPressed < 0)
 		{
 			mouseButtonsPressed = 0;
-			print("Warning: released an already released button\n");
+			dprint("Warning: released an already released button\n");
 		}
 	}
 	if(key == K_ALT) menuShiftState -= (menuShiftState & S_ALT);
@@ -221,7 +222,7 @@ void(float key, float ascii) m_keydown =
 		if(mouseButtonsPressed > 10)
 		{
 			mouseButtonsPressed = 10;
-			print("Warning: pressed an already pressed button\n");
+			dprint("Warning: pressed an already pressed button\n");
 		}
 	}
 	if(key == K_ALT) menuShiftState |= S_ALT;
@@ -341,11 +342,6 @@ float m_testtooltipbox(vector tooltippos)
 		return FALSE;
 	if(tooltippos_y + menuTooltipSize_y > 1)
 		return FALSE;
-	/*
-	menuTooltipOrigin_x = rint(tooltippos_x * cvar("vid_width")) / cvar("vid_width");
-	menuTooltipOrigin_y = rint(tooltippos_y * cvar("vid_height")) / cvar("vid_height");
-	menuTooltipOrigin_z = 0;
-	*/
 	menuTooltipOrigin = tooltippos;
 	return TRUE;
 }
@@ -566,7 +562,7 @@ void() m_draw =
 		if(!cvar("menu_video_played"))
 		{
 			localcmd("set menu_video_played 1; cd loop $menu_cdtrack; play sound/announcer/default/welcome.ogg\n");
-			menuLogoAlpha = -0.8; // no idea why, but when I start this at zero, it jumps instead of fading
+			menuLogoAlpha = -0.8; // no idea why, but when I start this at zero, it jumps instead of fading FIXME
 		}
 	}
 
@@ -839,7 +835,9 @@ void(string itemname) m_goto =
 	}
 	else
 	{
-		e = findstring(NULL, name, itemname);
+		for(e = NULL; (e = findstring(e, name, itemname)); )
+			if(e.classname != "vtbl")
+				break;
 		if(e)
 		{
 			m_hide();
@@ -858,10 +856,18 @@ void() m_goto_skin_selector =
 	m_goto("skinselector");
 }
 
+void() m_goto_language_selector =
+{
+	if(!menuInitialized)
+		return;
+	// TODO add code to switch back to the language selector (no idea how to do it now)
+	m_goto("languageselector");
+}
+
 void() m_goto_video_settings =
 {
 	if(!menuInitialized)
 		return;
-	// TODO add code to switch back to the skin selector (no idea how to do it now)
+	// TODO add code to switch back to the video settings (no idea how to do it now)
 	m_goto("videosettings");
 }