WIN32_LEAN_AND_MEAN patch from Willis to speed up MSVC compilation

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index ad31f39d23735ec378eb3c1f63ae8651c10177ac..aab7353205f216b3cade969399034b38fb9fe04e 100644 (file)
--- a/server.h
+++ b/server.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef SERVER_H
 #define SERVER_H
 
-typedef struct
+typedef struct server_static_s
 {
        // number of svs.clients slots (updated by maxplayers command)
        int maxclients;
@@ -32,13 +32,15 @@ typedef struct
        int serverflags;
        // cleared when at SV_SpawnServer
        qboolean changelevel_issued;
+       // server infostring
+       char serverinfo[MAX_SERVERINFO_STRING];
 } server_static_t;
 
 //=============================================================================
 
-typedef enum {ss_loading, ss_active} server_state_t;
+typedef enum server_state_e {ss_loading, ss_active} server_state_t;
 
-typedef struct
+typedef struct server_s
 {
        // false if only a net client
        qboolean active;
@@ -83,15 +85,15 @@ typedef struct
        server_state_t state;
 
        sizebuf_t datagram;
-       qbyte datagram_buf[NET_MAXMESSAGE];
+       unsigned char datagram_buf[NET_MAXMESSAGE];
 
        // copied to all clients at end of frame
        sizebuf_t reliable_datagram;
-       qbyte reliable_datagram_buf[NET_MAXMESSAGE];
+       unsigned char reliable_datagram_buf[NET_MAXMESSAGE];
 
        sizebuf_t signon;
        // LordHavoc: increased signon message buffer from 8192
-       qbyte signon_buf[NET_MAXMESSAGE];
+       unsigned char signon_buf[NET_MAXMESSAGE];
 } server_t;
 
 // if defined this does ping smoothing, otherwise it does not
@@ -107,10 +109,6 @@ typedef struct client_s
        qboolean clientconnectcalled;
        // false = don't send datagrams
        qboolean spawned;
-       // has been told to go to another level
-       qboolean dropasap;
-       // only valid before spawned
-       qboolean sendsignon;
 
        // requested rate in bytes per second
        int rate;
@@ -118,8 +116,8 @@ typedef struct client_s
        // realtime this client connected
        double connecttime;
 
-       // reliable messages must be sent periodically
-       double last_message;
+       // keepalive messages must be sent periodically during signon
+       double keepalivetime;
 
        // communications handle
        netconn_t *netconnection;
@@ -130,9 +128,6 @@ typedef struct client_s
        // intended motion calced from cmd
        vec3_t wishdir;
 
-       // can be added to at any time, copied and clear once per frame
-       sizebuf_t message;
-       qbyte msgbuf[NET_MAXMESSAGE];
        // PRVM_EDICT_NUM(clientnum+1)
        prvm_edict_t *edict;
 
@@ -163,6 +158,10 @@ typedef struct client_s
        // latest received clc_ackframe (used to detect packet loss)
        int latestframenum;
 
+       // cache weaponmodel name lookups
+       char weaponmodel[MAX_QPATH];
+       int weaponmodelindex;
+
        entityframe_database_t *entitydatabase;
        entityframe4_database_t *entitydatabase4;
        entityframe5_database_t *entitydatabase5;
@@ -246,7 +245,6 @@ extern cvar_t coop;
 extern cvar_t fraglimit;
 extern cvar_t timelimit;
 extern cvar_t pausable;
-extern cvar_t sv_deltacompress;
 extern cvar_t sv_maxvelocity;
 extern cvar_t sv_gravity;
 extern cvar_t sv_nostep;
@@ -272,6 +270,9 @@ extern cvar_t sv_gameplayfix_setmodelrealbox;
 extern cvar_t sv_gameplayfix_blowupfallenzombies;
 extern cvar_t sv_gameplayfix_findradiusdistancetobox;
 
+extern cvar_t sys_ticrate;
+extern cvar_t sv_fixedframeratesingleplayer;
+
 extern mempool_t *sv_mempool;
 
 // persistant server info
@@ -316,6 +317,7 @@ void SV_BroadcastPrint(const char *msg);
 void SV_BroadcastPrintf(const char *fmt, ...);
 
 void SV_Physics (void);
+void SV_Physics_ClientEntity (prvm_edict_t *ent);
 
 qboolean SV_PlayerCheckGround (prvm_edict_t *ent);
 qboolean SV_CheckBottom (prvm_edict_t *ent);