Merge remote branch 'origin/terencehill/powerups_respawntime_fix'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / serverlist.c

diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index a8494f8defe2b6ace5e30793af4295e86f7e07c6..1a94c115dd2c5b75ab10af99d6547c6ea4c1ae2d 100644 (file)
--- 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")
@@ -745,9 +747,9 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
                {
                        n = string_null;
                        if(isv6)
-                               draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_ipv6"), PRECACHE_PIC_MIPMAP);
+                               draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_ipv6"), 0); // PRECACHE_PIC_MIPMAP
                        else if(isv4)
-                               draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_ipv4"), PRECACHE_PIC_MIPMAP);
+                               draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_ipv4"), 0); // PRECACHE_PIC_MIPMAP
                        if(n)
                                draw_Picture(iconPos, n, iconSize, '1 1 1', 1);
                        iconPos_x += iconSize_x;
@@ -755,7 +757,7 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 
                if(q > 0)
                {
-                       draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_aeslevel", ftos(q)), PRECACHE_PIC_MIPMAP);
+                       draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_aeslevel", ftos(q)), 0); // PRECACHE_PIC_MIPMAP
                        draw_Picture(iconPos, n, iconSize, '1 1 1', 1);
                }
                iconPos_x += iconSize_x;
@@ -782,7 +784,7 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 
                if(sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS))
                {
-                       draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_stats1"), PRECACHE_PIC_MIPMAP);
+                       draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_stats1"), 0); // PRECACHE_PIC_MIPMAP
                        draw_Picture(iconPos, n, iconSize, '1 1 1', 1);
                }
                iconPos_x += iconSize_x;