X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.h;h=7341359ed0127134e8d3fd700a74991719c9ad3b;hp=e9e4ddac91a26bd5b6dc617f4692a509552e48b6;hb=0f623a3edc8209fb1b07cb0724ce689c84d1067c;hpb=d93b11b3f40d1ca94ed20e70c7a2fcf95670df73

diff --git a/netconn.h b/netconn.h
index e9e4ddac..7341359e 100755
--- a/netconn.h
+++ b/netconn.h
@@ -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;
 
@@ -480,7 +482,7 @@ typedef struct challenge_s
 }
 challenge_t;
 
-extern challenge_t challenge[MAX_CHALLENGES];
+extern challenge_t challenges[MAX_CHALLENGES];
 
 #endif