cleaned up and fixed collisions with brush models (example: you can now ramp jump...

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index 273b3de9e6bfcf7dee5e6f82195b62cf57f93acd..5a330ffefdd8b190f4e18b33cb4a2f2b03762fbb 100644 (file)
--- a/server.h
+++ b/server.h
@@ -42,10 +42,10 @@ typedef struct
        double          time;
 
        double          frametime;
-       
+
        int                     lastcheck;                      // used by PF_checkclient
        double          lastchecktime;
-       
+
        char            name[64];                       // map name
        char            modelname[64];          // maps/<name>.bsp, for model_precache[0]
        struct model_s  *worldmodel;
@@ -61,13 +61,13 @@ typedef struct
        server_state_t  state;                  // some actions are only valid during load
 
        sizebuf_t       datagram;
-       byte            datagram_buf[MAX_DATAGRAM];
+       qbyte           datagram_buf[MAX_DATAGRAM];
 
        sizebuf_t       reliable_datagram;      // copied to all clients at end of frame
-       byte            reliable_datagram_buf[MAX_DATAGRAM];
+       qbyte           reliable_datagram_buf[MAX_DATAGRAM];
 
        sizebuf_t       signon;
-       byte            signon_buf[32768]; // LordHavoc: increased signon message buffer from 8192 to 32768
+       qbyte           signon_buf[32768]; // LordHavoc: increased signon message buffer from 8192 to 32768
 } server_t;
 
 
@@ -81,6 +81,12 @@ typedef struct client_s
        qboolean                dropasap;                       // has been told to go to another level
        qboolean                sendsignon;                     // only valid before spawned
 
+#ifndef NOROUTINGFIX
+       // LordHavoc: to make netquake protocol get through NAT routers, have to wait for client to ack
+       qboolean                waitingforconnect;      // waiting for connect from client (stage 1)
+       qboolean                sendserverinfo;         // send server info in next datagram (stage 2)
+#endif
+
        double                  last_message;           // reliable messages must be sent
                                                                                // periodically
 
@@ -91,7 +97,7 @@ typedef struct client_s
 
        sizebuf_t               message;                        // can be added to at any time,
                                                                                // copied and clear once per frame
-       byte                    msgbuf[MAX_MSGLEN];
+       qbyte                   msgbuf[MAX_MSGLEN];
        edict_t                 *edict;                         // EDICT_NUM(clientnum+1)
        char                    name[32];                       // for printing to other people
        int                             colors;