X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=netconn.h;h=7120c531f87d98f186085e4d3d789ab664c1c136;hb=07afcce3f867df27f77a06d786ee00c8bd2db843;hp=e9e4ddac91a26bd5b6dc617f4692a509552e48b6;hpb=d93b11b3f40d1ca94ed20e70c7a2fcf95670df73;p=xonotic%2Fdarkplaces.git

diff --git a/netconn.h b/netconn.h
index e9e4ddac..7120c531 100755
--- a/netconn.h
+++ b/netconn.h
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 1996-1997 Id Software, Inc.
-Copyright (C) 2003 Forest Hale
+Copyright (C) 2003 Ashley Rose Hale (LadyHavoc)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -27,14 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define NET_HEADERSIZE		(2 * sizeof(unsigned int))
 
 // NetHeader flags
-#define NETFLAG_LENGTH_MASK	0x0000ffff
-#define NETFLAG_DATA		0x00010000
-#define NETFLAG_ACK			0x00020000
-#define NETFLAG_NAK			0x00040000
-#define NETFLAG_EOM			0x00080000
-#define NETFLAG_UNRELIABLE	0x00100000
-#define NETFLAG_CTL			0x80000000
-#define NETFLAG_CRYPTO		0x40000000
+#define NETFLAG_LENGTH_MASK 0x0000ffff
+#define NETFLAG_DATA        0x00010000
+#define NETFLAG_ACK         0x00020000
+#define NETFLAG_NAK         0x00040000
+#define NETFLAG_EOM         0x00080000
+#define NETFLAG_UNRELIABLE  0x00100000
+#define NETFLAG_CRYPTO0     0x10000000
+#define NETFLAG_CRYPTO1     0x20000000
+#define NETFLAG_CRYPTO2     0x40000000
+#define NETFLAG_CTL         0x80000000
 
 
 #define NET_PROTOCOL_VERSION	3
@@ -195,14 +197,14 @@ typedef struct netconn_s
 		int			qport;
 
 	// sequencing variables
-		int			incoming_sequence;
-		int			incoming_acknowledged;
-		int			incoming_reliable_acknowledged;	///< single bit
+		unsigned int		incoming_sequence;
+		unsigned int		incoming_acknowledged;
+		qboolean		incoming_reliable_acknowledged;	///< single bit
 
-		int			incoming_reliable_sequence;		///< single bit, maintained local
+		qboolean		incoming_reliable_sequence;		///< single bit, maintained local
 
-		int			reliable_sequence;			///< single bit
-		int			last_reliable_sequence;		///< sequence number of last send
+		qboolean		reliable_sequence;			///< single bit
+		unsigned int		last_reliable_sequence;		///< sequence number of last send
 	}
 	qw;
 
@@ -280,7 +282,7 @@ typedef struct serverlist_info_s
 	/// qc-defined short status string
 	char qcstatus[128];
 	/// frags/ping/name list (if they fit in the packet)
-	char players[1400];
+	char players[2800];
 	/// max client number
 	int maxplayers;
 	/// number of currently connected players (including bots)
@@ -419,7 +421,7 @@ extern char sv_readstring[MAX_INPUTLINE];
 
 extern cvar_t sv_public;
 
-extern cvar_t cl_netlocalping;
+extern cvar_t net_fakelag;
 
 extern cvar_t cl_netport;
 extern cvar_t sv_netport;
@@ -452,14 +454,14 @@ void NetConn_ClientFrame(void);
 void NetConn_ServerFrame(void);
 void NetConn_SleepMicroseconds(int microseconds);
 void NetConn_Heartbeat(int priority);
-void Net_Stats_f(void);
+void Net_Stats_f(cmd_state_t *cmd);
 
 #ifdef CONFIG_MENU
 void NetConn_QueryMasters(qboolean querydp, qboolean queryqw);
 void NetConn_QueryQueueFrame(void);
-void Net_Slist_f(void);
-void Net_SlistQW_f(void);
-void Net_Refresh_f(void);
+void Net_Slist_f(cmd_state_t *cmd);
+void Net_SlistQW_f(cmd_state_t *cmd);
+void Net_Refresh_f(cmd_state_t *cmd);
 
 /// ServerList interface (public)
 /// manually refresh the view set, do this after having changed the mask or any other flag
@@ -480,7 +482,7 @@ typedef struct challenge_s
 }
 challenge_t;
 
-extern challenge_t challenge[MAX_CHALLENGES];
+extern challenge_t challenges[MAX_CHALLENGES];
 
 #endif