fix rounding of drawsetcliparea coordinates (but not using round(), as that is C99)

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index 835c9f867d06b3599ca0852205947a6aa2ab220d..03d926509ff1482ac70f7299505d556f84b7adf7 100644 (file)
--- a/server.h
+++ b/server.h
@@ -48,6 +48,12 @@ typedef struct server_static_s
        float perf_acc_offset_squared;
        float perf_acc_offset_max;
        int perf_acc_offset_samples;
+
+       // csqc stuff
+       unsigned char *csqc_progdata;
+       size_t csqc_progsize_deflated;
+       unsigned char *csqc_progdata_deflated;
+
 } server_static_t;
 
 //=============================================================================
@@ -87,9 +93,6 @@ typedef struct server_s
        int csqc_progcrc; // -1 = no progs
        int csqc_progsize; // -1 = no progs
        char csqc_progname[MAX_QPATH]; // copied from csqc_progname at level start
-       unsigned char *csqc_progdata;
-       size_t csqc_progsize_deflated;
-       unsigned char *csqc_progdata_deflated;
 
        // collision culling data
        world_t world;
@@ -212,8 +215,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];
@@ -368,6 +371,10 @@ extern cvar_t sv_aim;
 extern cvar_t sv_airaccel_qw;
 extern cvar_t sv_airaccel_sideways_friction;
 extern cvar_t sv_airaccelerate;
+extern cvar_t sv_airstopaccelerate;
+extern cvar_t sv_airstrafeaccelerate;
+extern cvar_t sv_maxairstrafespeed;
+extern cvar_t sv_aircontrol;
 extern cvar_t sv_allowdownloads;
 extern cvar_t sv_allowdownloads_archive;
 extern cvar_t sv_allowdownloads_config;
@@ -378,7 +385,8 @@ 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_clmovement_maxnetfps;
 extern cvar_t sv_cullentities_nevercullbmodels;
 extern cvar_t sv_cullentities_pvs;
 extern cvar_t sv_cullentities_stats;