X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Futil.qc;h=0f8e341e74a782d75ec951d273e5d397ef4dd512;hb=14795863ffe0b7c2859794da85ae3b885b21d159;hp=78ac9de46c1bc96aeda3db938b27d8bc29b49cfd;hpb=e7916433ba6b3b19869aa73be8f753c78d20ec4d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 78ac9de46..0f8e341e7 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -280,7 +280,7 @@ void URI_Get_Callback(float id, float status, string data)
 	}
 	else
 	{
-		print(sprintf(_("Received HTTP request data for an invalid id %d.\n"), id));
+		print(sprintf("Received HTTP request data for an invalid id %d.\n", id));
 	}
 }
 
@@ -313,7 +313,7 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data)
 		n = 0;
 	else
 		n = tokenizebyseparator(data, "\n");
-	
+
 	if(n >= 1)
 	{
 		_Nex_ExtResponseSystem_UpdateTo = argv(0);
@@ -449,7 +449,7 @@ float preMenuInit()
 		boxA = '0.05 0.5 0' + 0.25 * sz_y * eY;
 		boxB = '0.95 0.5 0' + 1.25 * sz_y * eY;
 		draw_Fill(boxA, boxB - boxA, '1 1 1', 1);
-		
+
 		boxA += sz * 0.1;
 		boxB -= sz * 0.1;
 		draw_Fill(boxA, boxB - boxA, '0.1 0.1 0.1', 1);
@@ -465,7 +465,7 @@ float preMenuInit()
 string campaign_name_previous;
 float campaign_won_previous;
 #ifdef WATERMARK
-var string autocvar_menu_watermark = WATERMARK();
+var string autocvar_menu_watermark = WATERMARK;
 #else
 var string autocvar_menu_watermark = "";
 #endif
@@ -473,13 +473,12 @@ void postMenuDraw()
 {
 	if(autocvar_menu_watermark != "")
 	{
-		vector fs = '48 48 0';
 		draw_CenterText('0.5 0.1 0', sprintf(_("^1%s TEST BUILD"), autocvar_menu_watermark), globalToBoxSize('32 32 0', draw_scale), '1 1 1', 0.05, 1);
 	}
 }
 void preMenuDraw()
 {
-	vector fs, sz, line, mid;
+	vector fs, sz = '0 0 0', line, mid;
 
 	updateCheck();
 
@@ -508,7 +507,7 @@ void preMenuDraw()
 		draw_CenterText(mid - 1 * line, l1, fs, '1 0 0', 1, 0);
 		draw_CenterText(mid - 0 * line, l2, fs, '0 0 1', 1, 0);
 	}
-	if not(campaign_name_previous)
+	if (!campaign_name_previous)
 		campaign_name_previous = strzone(strcat(campaign_name, "x")); // force unequal
 	if(campaign_name == campaign_name_previous)
 	{
@@ -610,7 +609,6 @@ float updateCompression()
 	GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
 	GAMETYPE(MAPINFO_TYPE_RACE) \
 	GAMETYPE(MAPINFO_TYPE_CTS) \
-	GAMETYPE(MAPINFO_TYPE_RUNEMATCH) \
 	GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH) \
 	/* nothing */
 
@@ -618,11 +616,13 @@ float GameType_GetID(float cnt)
 {
 	float i;
 	i = 0;
-	
+
 	#define GAMETYPE(id) if(i++ == cnt) return id;
 	GAMETYPES
 	#undef GAMETYPE
-	
+
+	unused_float = i;
+
 	return 0;
 }
 
@@ -630,31 +630,31 @@ float GameType_GetCount()
 {
 	float i;
 	i = 0;
-	
+
 	#define GAMETYPE(id) ++i;
 	GAMETYPES
 	#undef GAMETYPE
-	
+
 	return i;
 }
 
 string GameType_GetName(float cnt)
 {
 	float i = GameType_GetID(cnt);
-	
+
 	if(i)
 		return MapInfo_Type_ToText(i);
-	
+
 	return "";
 }
 
 string GameType_GetIcon(float cnt)
 {
 	float i = GameType_GetID(cnt);
-	
+
 	if(i)
 		return strcat("gametype_", MapInfo_Type_ToString(i));
-	
+
 	return "";
 }
 
@@ -662,7 +662,7 @@ string GameType_GetIcon(float cnt)
 {
 	float i = GameType_GetID(cnt);
 	string s = _MapInfo_GetDefaultEx(i);
-	
+
 	if(i)
 	{
 		if(strstrofs(s, "teams", 0) >= 0)
@@ -670,7 +670,7 @@ string GameType_GetIcon(float cnt)
 		else
 			return _("free for all");
 	}
-	
+
 	return _("tuba for all");
 }*/