don't crash in scoreboard code when connected to a qw server as a spectator

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index f71a1f1435d4621fa2196bd00662792504f2a39b..e2db41c61da354f9dc9284f48128226ea9432ccf 100644 (file)
--- a/server.h
+++ b/server.h
@@ -32,6 +32,8 @@ typedef struct server_static_s
        int serverflags;
        // cleared when at SV_SpawnServer
        qboolean changelevel_issued;
+       // server infostring
+       char serverinfo[MAX_SERVERINFO_STRING];
 } server_static_t;
 
 //=============================================================================
@@ -50,9 +52,6 @@ typedef struct server_s
        // one of the PROTOCOL_ values
        protocolversion_t protocol;
 
-       // used for running multiple steps in one frame, etc
-       double timer;
-
        double time;
 
        double frametime;
@@ -83,15 +82,15 @@ typedef struct server_s
        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 +106,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 +113,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 +125,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;
 
@@ -144,6 +136,11 @@ typedef struct client_s
        // LordHavoc: can be used for prediction or whatever...
        float ping;
 
+       // this is used by sv_clmovement_minping code
+       double clmovement_disabletimeout;
+       // this is used by sv_clmvoement_waitforinput code
+       int clmovement_skipphysicsframes;
+
 // spawn parms are carried from level to level
        float spawn_parms[NUM_SPAWN_PARMS];
 
@@ -250,16 +247,18 @@ 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;
 extern cvar_t sv_friction;
+extern cvar_t sv_waterfriction;
 extern cvar_t sv_edgefriction;
 extern cvar_t sv_stopspeed;
 extern cvar_t sv_maxspeed;
 extern cvar_t sv_maxairspeed;
 extern cvar_t sv_accelerate;
+extern cvar_t sv_airaccelerate;
+extern cvar_t sv_wateraccelerate;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_aim;
 extern cvar_t sv_stepheight;
@@ -275,6 +274,8 @@ extern cvar_t sv_gameplayfix_swiminbmodels;
 extern cvar_t sv_gameplayfix_setmodelrealbox;
 extern cvar_t sv_gameplayfix_blowupfallenzombies;
 extern cvar_t sv_gameplayfix_findradiusdistancetobox;
+extern cvar_t sv_gameplayfix_qwplayerphysics;
+extern cvar_t sv_gameplayfix_upwardvelocityclearsongroundflag;
 
 extern cvar_t sys_ticrate;
 extern cvar_t sv_fixedframeratesingleplayer;