From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 12 Nov 2010 21:45:44 +0000 (+0100)
Subject: less obnoxious icons, but still not that good
X-Git-Tag: xonotic-v0.1.0preview~152
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d087f82c7b66bc6c73c619700dd74c7d6cfff35;p=xonotic%2Fxonotic-data.pk3dir.git

less obnoxious icons, but still not that good
---

diff --git a/gfx/menu/default/icon_ipv4.tga b/gfx/menu/default/icon_ipv4.tga
index a7334dd05..a0484f4e3 100644
Binary files a/gfx/menu/default/icon_ipv4.tga and b/gfx/menu/default/icon_ipv4.tga differ
diff --git a/gfx/menu/default/icon_ipv6.tga b/gfx/menu/default/icon_ipv6.tga
index a61947da7..d3fdc03ee 100644
Binary files a/gfx/menu/default/icon_ipv6.tga and b/gfx/menu/default/icon_ipv6.tga differ
diff --git a/gfx/menu/luminos/icon_ipv4.tga b/gfx/menu/luminos/icon_ipv4.tga
index a7334dd05..a0484f4e3 100644
Binary files a/gfx/menu/luminos/icon_ipv4.tga and b/gfx/menu/luminos/icon_ipv4.tga differ
diff --git a/gfx/menu/luminos/icon_ipv6.tga b/gfx/menu/luminos/icon_ipv6.tga
index a61947da7..d3fdc03ee 100644
Binary files a/gfx/menu/luminos/icon_ipv6.tga and b/gfx/menu/luminos/icon_ipv6.tga differ
diff --git a/gfx/menu/xaw/icon_ipv4.tga b/gfx/menu/xaw/icon_ipv4.tga
index a7334dd05..a0484f4e3 100644
Binary files a/gfx/menu/xaw/icon_ipv4.tga and b/gfx/menu/xaw/icon_ipv4.tga differ
diff --git a/gfx/menu/xaw/icon_ipv6.tga b/gfx/menu/xaw/icon_ipv6.tga
index a61947da7..d3fdc03ee 100644
Binary files a/gfx/menu/xaw/icon_ipv6.tga and b/gfx/menu/xaw/icon_ipv6.tga differ
diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index ae808130a..3d5d3e843 100644
--- a/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@ -658,20 +658,20 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 		{
 			iconPos_x += iconSize_x * 0.5;
 		}
-
-		draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_pure", ftos(strstrofs(s, ":P0:", 0) >= 0)), iconSize, '1 1 1', 1);
-
-		iconPos_x += iconSize_x;
-		draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_aeslevel", ftos(q)), iconSize, '1 1 1', 1);
-
-		iconPos_x += iconSize_x;
-		if(me.seenIPv4 && me.seenIPv6)
+		else if(me.seenIPv4 && me.seenIPv6)
 		{
 			if(isv6)
 				draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_ipv6"), iconSize, '1 1 1', 1);
 			else if(isv4)
 				draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_ipv4"), iconSize, '1 1 1', 1);
+			iconPos_x += iconSize_x;
 		}
+
+		draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_aeslevel", ftos(q)), iconSize, '1 1 1', 1);
+		iconPos_x += iconSize_x;
+
+		draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_pure", ftos(strstrofs(s, ":P0:", 0) >= 0)), iconSize, '1 1 1', 1);
+		iconPos_x += iconSize_x;
 	}
 
 	s = ftos(p);