added vid_stereobuffer cvar based on patch from syschuck on the alientrap forums

[xonotic/darkplaces.git] / netconn.h

diff --git a/netconn.h b/netconn.h
index d29bc2e6e2c9aa0fd0c164560a7a3b383a27b156..bbd1b88ed1cb3de1498bc284d78f0efa5e7490de 100755 (executable)
--- a/netconn.h
+++ b/netconn.h
@@ -133,19 +133,62 @@ typedef struct netconn_s
 
        // reliable message that is currently sending
        // (for building fragments)
-       unsigned int ackSequence;
-       unsigned int sendSequence;
-       unsigned int unreliableSendSequence;
        int sendMessageLength;
        unsigned char sendMessage[NET_MAXMESSAGE];
 
        // reliable message that is currently being received
        // (for putting together fragments)
-       unsigned int receiveSequence;
-       unsigned int unreliableReceiveSequence;
        int receiveMessageLength;
        unsigned char receiveMessage[NET_MAXMESSAGE];
 
+       struct netconn_nq_s
+       {
+               unsigned int ackSequence;
+               unsigned int sendSequence;
+               unsigned int unreliableSendSequence;
+
+               unsigned int receiveSequence;
+               unsigned int unreliableReceiveSequence;
+       }
+       nq;
+       struct netconn_qw_s
+       {
+               // QW protocol
+               qboolean        fatal_error;
+
+               float           last_received;          // for timeouts
+
+       // the statistics are cleared at each client begin, because
+       // the server connecting process gives a bogus picture of the data
+               float           frame_latency;          // rolling average
+               float           frame_rate;
+
+               int                     drop_count;                     // dropped packets, cleared each level
+               int                     good_count;                     // cleared each level
+
+               int                     qport;
+
+       // bandwidth estimator
+               double          cleartime;                      // if realtime > nc->cleartime, free to go
+               double          rate;                           // seconds / byte
+
+       // sequencing variables
+               int                     incoming_sequence;
+               int                     incoming_acknowledged;
+               int                     incoming_reliable_acknowledged; // single bit
+
+               int                     incoming_reliable_sequence;             // single bit, maintained local
+
+               int                     outgoing_sequence;
+               int                     reliable_sequence;                      // single bit
+               int                     last_reliable_sequence;         // sequence number of last send
+       }
+       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;
 
@@ -154,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
@@ -198,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
@@ -230,6 +275,8 @@ typedef struct serverlist_entry_s
        unsigned querycounter;
        // used to calculate ping when update comes in
        double querytime;
+       // query protocol to use on this server
+       int protocol; // may be PROTOCOL_QUAKEWORLD or PROTOCOL_DARKPLACES7
 
        serverlist_info_t info;
 
@@ -258,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
@@ -294,7 +326,7 @@ extern cvar_t sv_netport;
 extern cvar_t net_address;
 //extern cvar_t net_netaddress_ipv6;
 
-int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data);
+int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol);
 void NetConn_CloseClientPorts(void);
 void NetConn_OpenClientPorts(void);
 void NetConn_CloseServerPorts(void);
@@ -313,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