changed r_speeds glFinish to only occur when set to 2, not 1 or 3

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index 7095d4364ac55b3b27f49f31ff6b3fec3170598f..555bef607a82b9ee3c5cc57bfce15e2f0b9773e6 100644 (file)
--- a/server.h
+++ b/server.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 typedef struct server_static_s
 {
        // number of svs.clients slots (updated by maxplayers command)
-       int maxclients;
+       int maxclients, maxclients_next;
        // client slots
        struct client_s *clients;
        // episode completion information
@@ -68,6 +68,7 @@ typedef struct server_s
        qboolean active;
 
        qboolean paused;
+       double pausedstart;
        // handle connections specially
        qboolean loadgame;
 
@@ -211,8 +212,8 @@ typedef struct client_s
 
        // this is used by sv_clmovement_minping code
        double clmovement_disabletimeout;
-       // this is used by sv_clmvoement_waitforinput code
-       int clmovement_skipphysicsframes;
+       // this is used by sv_clmovement_inputtimeout code
+       float clmovement_inputtimeout;
 
 // spawn parms are carried from level to level
        float spawn_parms[NUM_SPAWN_PARMS];
@@ -377,7 +378,7 @@ extern cvar_t sv_checkforpacketsduringsleep;
 extern cvar_t sv_clmovement_enable;
 extern cvar_t sv_clmovement_minping;
 extern cvar_t sv_clmovement_minping_disabletime;
-extern cvar_t sv_clmovement_waitforinput;
+extern cvar_t sv_clmovement_inputtimeout;
 extern cvar_t sv_cullentities_nevercullbmodels;
 extern cvar_t sv_cullentities_pvs;
 extern cvar_t sv_cullentities_stats;
@@ -402,6 +403,7 @@ extern cvar_t sv_gameplayfix_easierwaterjump;
 extern cvar_t sv_gameplayfix_findradiusdistancetobox;
 extern cvar_t sv_gameplayfix_grenadebouncedownslopes;
 extern cvar_t sv_gameplayfix_multiplethinksperframe;
+extern cvar_t sv_gameplayfix_slidemoveprojectiles;
 extern cvar_t sv_gameplayfix_noairborncorpse;
 extern cvar_t sv_gameplayfix_setmodelrealbox;
 extern cvar_t sv_gameplayfix_stepdown;