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 a7334dd0560259f67c005bcd43f5e526d0e2047b..a0484f4e37eeb9aba750de55cf2e203b654cdb7e 100644 (file)
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 a61947da785343cbb26660f75a4d2c07399d8f91..d3fdc03ee3e1cd4e6951e1b44beebd0d34b2111a 100644 (file)
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 a7334dd0560259f67c005bcd43f5e526d0e2047b..a0484f4e37eeb9aba750de55cf2e203b654cdb7e 100644 (file)
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 a61947da785343cbb26660f75a4d2c07399d8f91..d3fdc03ee3e1cd4e6951e1b44beebd0d34b2111a 100644 (file)
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 a7334dd0560259f67c005bcd43f5e526d0e2047b..a0484f4e37eeb9aba750de55cf2e203b654cdb7e 100644 (file)
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 a61947da785343cbb26660f75a4d2c07399d8f91..d3fdc03ee3e1cd4e6951e1b44beebd0d34b2111a 100644 (file)
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 ae808130a896e81242d00c355662643a3aaa7fbc..3d5d3e843cecb59fbc2a94d4bbecbc47ff68d455 100644 (file)
--- 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);