X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=netconn.h;h=bbd1b88ed1cb3de1498bc284d78f0efa5e7490de;hb=bf7fdc26371e2823650c8af6d78ef1e28513f7eb;hp=b3c328c6cd854f7f78a23fdef10ec6629280cb0e;hpb=33829ae1f736d7a691259d60bb8c29f7f9367cc3;p=xonotic%2Fdarkplaces.git

diff --git a/netconn.h b/netconn.h
index b3c328c6..bbd1b88e 100755
--- a/netconn.h
+++ b/netconn.h
@@ -185,6 +185,10 @@ typedef struct netconn_s
 	}
 	qw;
 
+	// this tracks which of the last 100 received packet sequence numbers were lost
+	int packetlostcounter;
+	unsigned char packetlost[100];
+
 	char address[128];
 } netconn_t;
 
@@ -193,8 +197,6 @@ extern mempool_t *netconn_mempool;
 
 extern cvar_t hostname;
 extern cvar_t developer_networking;
-extern char playername[];
-extern int playercolor;
 
 #define SERVERLIST_TOTALSIZE		2048
 #define SERVERLIST_VIEWLISTSIZE		SERVERLIST_TOTALSIZE
@@ -237,6 +239,10 @@ typedef struct serverlist_info_s
 	int numplayers;
 	// protocol version
 	int protocol;
+	// game data version
+	// (an integer that is used for filtering incompatible servers,
+	//  not filterable by QC)
+	int gameversion;
 } serverlist_info_t;
 
 typedef enum
@@ -299,21 +305,6 @@ extern int serverlist_cachecount;
 
 extern qboolean serverlist_consoleoutput;
 
-#if !defined(_WIN32) && !defined(__linux__) && !defined(SUNOS)
-#ifndef htonl
-extern unsigned long htonl (unsigned long hostlong);
-#endif
-#ifndef htons
-extern unsigned short htons (unsigned short hostshort);
-#endif
-#ifndef ntohl
-extern unsigned long ntohl (unsigned long netlong);
-#endif
-#ifndef ntohs
-extern unsigned short ntohs (unsigned short netshort);
-#endif
-#endif
-
 //============================================================================
 //
 // public network functions
@@ -354,17 +345,18 @@ int NetConn_WriteString(lhnetsocket_t *mysocket, const char *string, const lhnet
 int NetConn_IsLocalGame(void);
 void NetConn_ClientFrame(void);
 void NetConn_ServerFrame(void);
-void NetConn_QueryMasters(void);
+void NetConn_QueryMasters(qboolean querydp, qboolean queryqw);
 void NetConn_Heartbeat(int priority);
 void NetConn_QueryQueueFrame(void);
 void Net_Stats_f(void);
 void Net_Slist_f(void);
+void Net_SlistQW_f(void);
 
 // ServerList interface (public)
 // manually refresh the view set, do this after having changed the mask or any other flag
 void ServerList_RebuildViewList(void);
 void ServerList_ResetMasks(void);
-void ServerList_QueryList(void);
+void ServerList_QueryList(qboolean querydp, qboolean queryqw);
 
 #endif