X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fmenu.qc;h=d7fd581a32f9a3f15125d8ed246bcc90cbffc05a;hb=402c9d84fe00cc341e02db9b6e3db5b617301ed6;hp=8bc54d48041bc53de79f6f4bd74b64d2599d29bb;hpb=cd1ccb7c3ac08760ccc361d6c863fcc2ade4ac2e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 8bc54d480..d7fd581a3 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -56,7 +56,7 @@ void m_init()
 	check_unacceptable_compiler_bugs();
 
 #ifdef WATERMARK
-	print(sprintf(_("^4MQC Build information: ^1%s\n"), WATERMARK));
+	printf(_("^4MQC Build information: ^1%s\n"), WATERMARK);
 #endif
 
 	// list all game dirs (TEST)
@@ -67,7 +67,7 @@ void m_init()
 		for(i = 0; ; ++i)
 		{
 			s = getgamedirinfo(i, GETGAMEDIRINFO_NAME);
-			if not(s)
+			if (!s)
 				break;
 			dprint(s, ": ", getgamedirinfo(i, GETGAMEDIRINFO_DESCRIPTION));
 		}
@@ -77,6 +77,8 @@ void m_init()
 	CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
 	CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
 
+	RegisterSLCategories();
+
 	float ddsload = cvar("r_texture_dds_load");
 	float texcomp = cvar("gl_texturecompression");
 	updateCompression();
@@ -91,8 +93,6 @@ void m_init()
 			m_hide();
 		cvar_set("_menu_initialized", "1");
 	}
-
-        PlayerInfo_Details();
 }
 
 const float MENU_ASPECT = 1.25; // 1280x1024
@@ -110,7 +110,8 @@ void UpdateConWidthHeight(float w, float h, float p)
 {
 	if (w != vidwidth_s || h != vidheight_s || p != vidpixelheight_s)
 	{
-		updateConwidths(w, h, p);
+		if (updateConwidths(w, h, p))
+			localcmd(sprintf("\nexec %s\n", cvar_string("menu_font_cfg")));
 		vidwidth_s = w;
 		vidheight_s = h;
 		vidpixelheight_s = p;
@@ -665,7 +666,7 @@ void m_tooltip(vector pos)
 			while(getWrappedLine_remaining)
 			{
 				s = getWrappedLine(SKINWIDTH_TOOLTIP, fontsize, draw_TextWidth_WithoutColors);
-				draw_Text(p, s, fontsize, '1 1 1', SKINALPHA_TOOLTIP * menuTooltipAlpha, FALSE);
+				draw_Text(p, s, fontsize, SKINCOLOR_TOOLTIP, SKINALPHA_TOOLTIP * menuTooltipAlpha, FALSE);
 				p_y += fontsize_y;
 			}
 		}
@@ -991,7 +992,7 @@ void m_goto(string itemname)
 		for(e = NULL; (e = find(e, name, itemname)); )
 			if(e.classname != "vtbl")
 				break;
-				
+
 		if((e) && (!e.requiresConnection || (gamestatus & (GAME_ISSERVER | GAME_CONNECTED))))
 		{
 			m_hide();