changed main() argv parameter to non-const, and casting it to const on assignment...

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index d7cfd72751feaafd981d85f74b80824312d5119a..8e94e5adb63cf76bd6af20a45dd7324e81a9a3d2 100644 (file)
--- a/server.h
+++ b/server.h
@@ -47,6 +47,11 @@ typedef struct
        // handle connections specially
        qboolean loadgame;
 
+       // one of the PROTOCOL_ values
+       int protocol;
+       // this disables extensions when using PROTOCOL_QUAKE
+       qboolean netquakecompatible;
+
        double time;
 
        double frametime;
@@ -153,16 +158,9 @@ typedef struct client_s
        // prevent animated names
        float nametime;
 
-#ifdef QUAKEENTITIES
-       // delta compression state
-       float nextfullupdate[MAX_EDICTS];
-#elif 0
-       entity_database_t entitydatabase;
-       int entityframenumber; // incremented each time an entity frame is sent
-#else
-       entity_database4_t *entitydatabase4;
-       int entityframenumber; // incremented each time an entity frame is sent
-#endif
+       entityframe_database_t *entitydatabase;
+       entityframe4_database_t *entitydatabase4;
+       entityframe5_database_t *entitydatabase5;
 } client_t;
 
 
@@ -256,9 +254,12 @@ extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_aim;
 extern cvar_t sv_stepheight;
 extern cvar_t sv_jumpstep;
+extern cvar_t sv_public;
+extern cvar_t sv_maxrate;
 
 extern cvar_t sv_gameplayfix_grenadebouncedownslopes;
 extern cvar_t sv_gameplayfix_noairborncorpse;
+extern cvar_t sv_gameplayfix_stepdown;
 extern cvar_t sv_gameplayfix_stepwhilejumping;
 extern cvar_t sv_gameplayfix_swiminbmodels;
 
@@ -306,6 +307,7 @@ void SV_BroadcastPrintf(const char *fmt, ...);
 
 void SV_Physics (void);
 
+qboolean SV_PlayerCheckGround (edict_t *ent);
 qboolean SV_CheckBottom (edict_t *ent);
 qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink);