remove the exec default.cfg call from the reset to defaults, I have no idea why it...

[xonotic/darkplaces.git] / netconn.h

diff --git a/netconn.h b/netconn.h
index 26a4ce864c646a2012a0177ab9920e460fc5bab7..cc991276ea9c4c612f387266cf8c0cffdb64321c 100755 (executable)
--- a/netconn.h
+++ b/netconn.h
@@ -122,7 +122,10 @@ typedef struct netconn_s
        lhnetaddress_t peeraddress;
 
        // this is mostly identical to qsocket_t from quake
+
+       // if this time is reached, kick off peer
        double connecttime;
+       double timeout;
        double lastMessageTime;
        double lastSendTime;
 
@@ -156,7 +159,9 @@ extern int playercolor;
 typedef struct
 {
        // ping time for sorting servers
-       double ping;
+       int ping;
+       // used to calculate ping when update comes in
+       double querytime;
        // address for connecting
        char cname[128];
        // description (seen by user)
@@ -188,8 +193,17 @@ extern unsigned short ntohs (unsigned short netshort);
 //
 //============================================================================
 
+extern double masterquerytime;
+extern int masterquerycount;
+extern int masterreplycount;
+extern int serverquerycount;
+extern int serverreplycount;
+
 extern sizebuf_t net_message;
 
+extern cvar_t cl_fakelocalping_min;
+extern cvar_t cl_fakelocalping_max;
+
 int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data);
 //void NetConn_SendMessageNext(netconn_t *conn);
 //void NetConn_ReSendMessage(netconn_t *conn);
@@ -206,6 +220,7 @@ void NetConn_Shutdown(void);
 netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress);
 void NetConn_Close(netconn_t *conn);
 void NetConn_Listen(qboolean state);
+int NetConn_IsLocalGame(void);
 //int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length);
 //int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress);
 //int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress);