Remove FS_FIX_PATHS again and disable model rendering in the menu until someone can...

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index 33099d38960828a2ffac821f54a5a75cc3728de5..4105076a1437920a10dc7b623b5286fd0d80e93e 100644 (file)
--- a/server.h
+++ b/server.h
@@ -228,6 +228,9 @@ typedef struct client_s
        char weaponmodel[MAX_QPATH];
        int weaponmodelindex;
 
+       // clientcamera (entity to use as camera)
+       int clientcamera;
+
        entityframe_database_t *entitydatabase;
        entityframe4_database_t *entitydatabase4;
        entityframe5_database_t *entitydatabase5;
@@ -369,6 +372,7 @@ 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;
@@ -464,6 +468,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