X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.h;h=c12d2babe790f2f26610dc9bf110cd65489875e6;hp=7bb3c53c61c8193c017984a0d2790a24c7e350ac;hb=d754dc235e18fafe7ccf6ea5f791cd4799128155;hpb=cdb529ba4871c881a01c7e162fde68e8999bcbe5

diff --git a/netconn.h b/netconn.h
index 7bb3c53c..c12d2bab 100755
--- a/netconn.h
+++ b/netconn.h
@@ -150,17 +150,25 @@ extern cvar_t developer_networking;
 extern char playername[];
 extern int playercolor;
 
-#define HOSTCACHE_TOTALSIZE			2048
-#define HOSTCACHE_VIEWCACHESIZE		128
+#define SERVERLIST_TOTALSIZE			2048
+#define SERVERLIST_VIEWLISTSIZE		128
+#define SERVERLIST_ANDMASKCOUNT		5
+#define SERVERLIST_ORMASKCOUNT		5
 
 typedef enum 
 {
-	HCMO_GREATEREQUAL,
-	HCMO_GREATER,
-	HCMO_EQUAL,
-	HCMO_LESSEQUAL,
-	HCMO_LESS,
-} hostcache_maskop_t;
+	// SLMO_CONTAINS is the default for strings
+	// SLMO_GREATEREQUAL is the default for numbers (also used when OP == CONTAINS or NOTCONTAINS
+	SLMO_CONTAINS,
+	SLMO_NOTCONTAIN,
+
+	SLMO_LESSEQUAL,
+	SLMO_LESS,
+	SLMO_EQUAL,
+	SLMO_GREATER,
+	SLMO_GREATEREQUAL,
+	SLMO_NOTEQUAL
+} serverlist_maskop_t;
 
 // struct with all fields that you can search for or sort by
 typedef struct
@@ -183,21 +191,21 @@ typedef struct
 	int numplayers;
 	// protocol version
 	int protocol;
-} hostcache_info_t;
+} serverlist_info_t;
 
 typedef enum 
 {
-	HCIF_CNAME,
-	HCIF_PING,
-	HCIF_GAME,
-	HCIF_MOD,
-	HCIF_MAP,
-	HCIF_NAME,
-	HCIF_MAXPLAYERS,
-	HCIF_NUMPLAYERS,
-	HCIF_PROTOCOL,
-	HCIF_COUNT
-} hostcache_infofield_t;
+	SLIF_CNAME,
+	SLIF_PING,
+	SLIF_GAME,
+	SLIF_MOD,
+	SLIF_MAP,
+	SLIF_NAME,
+	SLIF_MAXPLAYERS,
+	SLIF_NUMPLAYERS,
+	SLIF_PROTOCOL,
+	SLIF_COUNT
+} serverlist_infofield_t;
 
 typedef struct
 {
@@ -206,32 +214,32 @@ typedef struct
 	// used to calculate ping when update comes in
 	double querytime;
 
-	hostcache_info_t info;
+	serverlist_info_t info;
 	
 	// legacy stuff
 	char line1[128];
 	char line2[128];
-} hostcache_t;
+} serverlist_entry_t;
 
 typedef struct
 {
-	hostcache_maskop_t pingtest;
-	hostcache_maskop_t maxplayerstest;
-	hostcache_maskop_t numplayerstest;
-	hostcache_maskop_t protocoltest;
-	hostcache_info_t info;
-} hostcache_mask_t;
+	qboolean			active;
+	serverlist_maskop_t  tests[SLIF_COUNT];
+	serverlist_info_t info;
+} serverlist_mask_t;
 
-extern hostcache_mask_t			hostcache_currentmask;
-extern hostcache_infofield_t	hostcache_sortbyfield;
-extern qboolean					hostcache_sortdescending;
+extern serverlist_mask_t serverlist_andmasks[SERVERLIST_ANDMASKCOUNT];
+extern serverlist_mask_t serverlist_ormasks[SERVERLIST_ORMASKCOUNT];
 
-extern int			hostcache_viewcount;
-extern hostcache_t	*hostcache_viewset[HOSTCACHE_VIEWCACHESIZE];
+extern serverlist_infofield_t serverlist_sortbyfield;
+extern qboolean serverlist_sortdescending;
 
-extern int			hostcache_cachecount; 
+extern int serverlist_viewcount;
+extern serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE];
 
-extern qboolean		hostcache_consoleoutput;
+extern int serverlist_cachecount; 
+
+extern qboolean serverlist_consoleoutput;
 
 #if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__)
 #ifndef htonl
@@ -292,11 +300,11 @@ int NetConn_SendToAll(sizebuf_t *data, double blocktime);
 void Net_Stats_f(void);
 void Net_Slist_f(void);
 
-// Hostcache interface
+// ServerList interface (public)
 // manually refresh the view set, do this after having changed the mask or any other flag
-void HostCache_RebuildViewSet(void);
-void HostCache_ResetMask(void);
-void HostCache_QueryList(void);
+void ServerList_RebuildViewList(void);
+void ServerList_ResetMasks(void);
+void ServerList_QueryList(void);
 
 #endif