less obnoxious icons, but still not that good
authorRudolf Polzer <divverent@alientrap.org>
Fri, 12 Nov 2010 21:45:44 +0000 (22:45 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 12 Nov 2010 21:45:44 +0000 (22:45 +0100)
gfx/menu/default/icon_ipv4.tga
gfx/menu/default/icon_ipv6.tga
gfx/menu/luminos/icon_ipv4.tga
gfx/menu/luminos/icon_ipv6.tga
gfx/menu/xaw/icon_ipv4.tga
gfx/menu/xaw/icon_ipv6.tga
qcsrc/menu/xonotic/serverlist.c

index a7334dd..a0484f4 100644 (file)
Binary files a/gfx/menu/default/icon_ipv4.tga and b/gfx/menu/default/icon_ipv4.tga differ
index a61947d..d3fdc03 100644 (file)
Binary files a/gfx/menu/default/icon_ipv6.tga and b/gfx/menu/default/icon_ipv6.tga differ
index a7334dd..a0484f4 100644 (file)
Binary files a/gfx/menu/luminos/icon_ipv4.tga and b/gfx/menu/luminos/icon_ipv4.tga differ
index a61947d..d3fdc03 100644 (file)
Binary files a/gfx/menu/luminos/icon_ipv6.tga and b/gfx/menu/luminos/icon_ipv6.tga differ
index a7334dd..a0484f4 100644 (file)
Binary files a/gfx/menu/xaw/icon_ipv4.tga and b/gfx/menu/xaw/icon_ipv4.tga differ
index a61947d..d3fdc03 100644 (file)
Binary files a/gfx/menu/xaw/icon_ipv6.tga and b/gfx/menu/xaw/icon_ipv6.tga differ
index ae80813..3d5d3e8 100644 (file)
@@ -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);