Merge remote-tracking branch 'origin/master' into samual/serverlist

[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 2b35d60a0576ee82b36625333e01d9f348b07873..0a3fd91db6914cae0801f1d9ac8fc7828570055d 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@ -57,6 +57,7 @@ CLASS(XonoticServerList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticServerList, seenIPv6, float, 0)
 ENDCLASS(XonoticServerList)
 entity makeXonoticServerList();
+
 void ServerList_Connect_Click(entity btn, entity me);
 void ServerList_ShowEmpty_Click(entity box, entity me);
 void ServerList_ShowFull_Click(entity box, entity me);
@@ -65,6 +66,7 @@ void ServerList_Favorite_Click(entity btn, entity me);
 void ServerList_Info_Click(entity btn, entity me);
 void ServerList_Update_favoriteButton(entity btn, entity me);
 
+#ifndef IMPLEMENTATION
 float SLIST_FIELD_CNAME;
 float SLIST_FIELD_PING;
 float SLIST_FIELD_GAME;
@@ -82,6 +84,8 @@ float SLIST_FIELD_QCSTATUS;
 float SLIST_FIELD_ISFAVORITE;
 #endif
 
+#endif
+
 #ifdef IMPLEMENTATION
 void ServerList_UpdateFieldIDs()
 {