CPMA-style cl_movement physics settings possible! Variables for it:

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index ac5e1edfd8ae41fe74f27d833af12049c9e9a7ed..03d926509ff1482ac70f7299505d556f84b7adf7 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
@@ -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;
 
 //=============================================================================
@@ -68,6 +74,7 @@ typedef struct server_s
        qboolean active;
 
        qboolean paused;
+       double pausedstart;
        // handle connections specially
        qboolean loadgame;
 
@@ -147,8 +154,20 @@ typedef struct server_s
        int sententitiesmark;
        int sententities[MAX_EDICTS];
        int sententitiesconsideration[MAX_EDICTS];
+
+       // legacy support for self.Version based csqc entity networking
+       unsigned char csqcentityversion[MAX_EDICTS]; // legacy
 } server_t;
 
+#define NUM_CSQCENTITIES_PER_FRAME 1024
+typedef struct csqcentityframedb_s
+{
+       int framenum;
+       int num;
+       unsigned short entno[NUM_CSQCENTITIES_PER_FRAME];
+       int sendflags[NUM_CSQCENTITIES_PER_FRAME];
+} csqcentityframedb_t;
+
 // if defined this does ping smoothing, otherwise it does not
 //#define NUM_PING_TIMES 16
 
@@ -196,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];
@@ -215,8 +234,17 @@ typedef struct client_s
        // visibility state
        float visibletime[MAX_EDICTS];
 
-       // version number of csqc-based entity to decide whether to send it
-       unsigned char csqcentityversion[MAX_EDICTS];
+       // scope is whether an entity is currently being networked to this client
+       // sendflags is what properties have changed on the entity since the last
+       // update that was sent
+       int csqcnumedicts;
+       unsigned char csqcentityscope[MAX_EDICTS];
+       unsigned int csqcentitysendflags[MAX_EDICTS];
+
+#define NUM_CSQCENTITYDB_FRAMES 64
+       unsigned char csqcentityglobalhistory[MAX_EDICTS]; // set to 1 if the entity was ever csqc networked to the client, and never reset back to 0
+       csqcentityframedb_t csqcentityframehistory[NUM_CSQCENTITYDB_FRAMES];
+       int csqcentityframehistory_next;
 
        // prevent animated names
        float nametime;
@@ -249,6 +277,7 @@ typedef struct client_s
        int download_expectedposition; // next position the client should ack
        qboolean download_started;
        char download_name[MAX_QPATH];
+       qboolean download_deflate;
 
        // fixangle data
        qboolean fixangle_angles_set;
@@ -342,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;
@@ -352,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;
@@ -372,16 +406,19 @@ extern cvar_t sv_friction;
 extern cvar_t sv_gameplayfix_blowupfallenzombies;
 extern cvar_t sv_gameplayfix_delayprojectiles;
 extern cvar_t sv_gameplayfix_droptofloorstartsolid;
+extern cvar_t sv_gameplayfix_droptofloorstartsolid_nudgetocorrect;
 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;
 extern cvar_t sv_gameplayfix_stepwhilejumping;
 extern cvar_t sv_gameplayfix_swiminbmodels;
 extern cvar_t sv_gameplayfix_upwardvelocityclearsongroundflag;
+extern cvar_t sv_gameplayfix_gravityunaffectedbyticrate;
 extern cvar_t sv_gravity;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_jumpstep;
@@ -467,6 +504,10 @@ qboolean SV_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink, qboolean
 // if touchtriggers, calls prog functions for the intersected triggers
 void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers);
 
+// move an entity that is stuck by small amounts in various directions to try to nudge it back into the collision hull
+// returns true if it found a better place
+qboolean SV_UnstickEntity (prvm_edict_t *ent);
+
 // calculates hitsupercontentsmask for a generic qc entity
 int SV_GenericHitSuperContentsMask(const prvm_edict_t *edict);
 // traces a box move against worldmodel and all entities in the specified area