-Changed HostCache to ServerList (and a few other pure name changes)

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index d42e4cca432af84dea23fe1ff00300bcc33b0d11..184df15f104d771ffce97dbbd71fe4461c226450 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -4179,8 +4179,8 @@ void M_ServerList_Draw (void)
                M_Print(16, menu_height - 8, m_return_reason);
        y = 48;
        visible = (menu_height - 16 - y) / 8 / 2;
-       start = bound(0, slist_cursor - (visible >> 1), hostcache_viewcount - visible);
-       end = min(start + visible, hostcache_viewcount);
+       start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible);
+       end = min(start + visible, serverlist_viewcount);
 
        p = Draw_CachePic("gfx/p_multi.lmp");
        M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi.lmp");
@@ -4189,8 +4189,8 @@ void M_ServerList_Draw (void)
                for (n = start;n < end;n++)
                {
                        DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
-                       M_Print(0, y, hostcache_viewset[n]->line1);y += 8;
-                       M_Print(0, y, hostcache_viewset[n]->line2);y += 8;
+                       M_Print(0, y, serverlist_viewlist[n]->line1);y += 8;
+                       M_Print(0, y, serverlist_viewlist[n]->line2);y += 8;
                }
        }
        else if (realtime - masterquerytime < 3)
@@ -4220,21 +4220,21 @@ void M_ServerList_Key(int k, char ascii)
                S_LocalSound ("sound/misc/menu1.wav");
                slist_cursor--;
                if (slist_cursor < 0)
-                       slist_cursor = hostcache_viewcount - 1;
+                       slist_cursor = serverlist_viewcount - 1;
                break;
 
        case K_DOWNARROW:
        case K_RIGHTARROW:
                S_LocalSound ("sound/misc/menu1.wav");
                slist_cursor++;
-               if (slist_cursor >= hostcache_viewcount)
+               if (slist_cursor >= serverlist_viewcount)
                        slist_cursor = 0;
                break;
 
        case K_ENTER:
                S_LocalSound ("sound/misc/menu2.wav");
-               if (hostcache_viewcount)
-                       Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname));
+               if (serverlist_viewcount)
+                       Cbuf_AddText(va("connect \"%s\"\n", serverlist_viewlist[slist_cursor]->info.cname));
                break;
 
        default: