From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 21 Feb 2012 22:08:23 +0000 (+0100)
Subject: do not use gamedir name for icon
X-Git-Tag: xonotic-v0.6.0~56
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bd3d3a894dd161be8319c7b6f20aeb670f13dfc6;p=xonotic%2Fxonotic-data.pk3dir.git

do not use gamedir name for icon
---

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
index e33be7bb1..4e6d6f590 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
@@ -154,8 +154,7 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
 
 	s = gethostcachestring(SLIST_FIELD_MOD, i);
 	if(s != "data")
-		if(modname == "Xonotic")
-			modname = s;
+		modname = sprintf(_("%s (%s)"), modname, s);
 
 	j = MapInfo_Type_FromString(typestr); // try and get the real name of the game type
 	if(j) { typestr = MapInfo_Type_ToText(j); } // only set it if we actually found it
diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index 66f35678c..1a94c115d 100644
--- a/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@ -637,11 +637,13 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 		modname = "Xonotic";
 #endif
 
+	/*
 	SLIST_FIELD_MOD = gethostcacheindexforkey("mod");
 	s = gethostcachestring(SLIST_FIELD_MOD, i);
 	if(s != "data")
 		if(modname == "Xonotic")
 			modname = s;
+	*/
 
 	// list the mods here on which the pure server check actually works
 	if(modname != "Xonotic")