Merge Cmd_Init_Commands into Cmd_Init

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index 8c54f97f6f9da2ca9f9f2247f28a89a6f7e44627..46c124633d90e86a4e4d831ff0ef1146613e7ab6 100644 (file)
--- a/server.h
+++ b/server.h
@@ -112,12 +112,12 @@ typedef struct server_s
        char worldnamenoextension[MAX_QPATH]; // maps/%s
        struct model_s *worldmodel;
        // NULL terminated
-       // LordHavoc: precaches are now MAX_QPATH rather than a pointer
+       // LadyHavoc: precaches are now MAX_QPATH rather than a pointer
        // updated by SV_ModelIndex
        char model_precache[MAX_MODELS][MAX_QPATH];
        struct model_s *models[MAX_MODELS];
        // NULL terminated
-       // LordHavoc: precaches are now MAX_QPATH rather than a pointer
+       // LadyHavoc: precaches are now MAX_QPATH rather than a pointer
        // updated by SV_SoundIndex
        char sound_precache[MAX_SOUNDS][MAX_QPATH];
        char lightstyles[MAX_LIGHTSTYLES][64];
@@ -132,7 +132,7 @@ typedef struct server_s
        unsigned char reliable_datagram_buf[NET_MAXMESSAGE];
 
        sizebuf_t signon;
-       /// LordHavoc: increased signon message buffer from 8192
+       /// LadyHavoc: increased signon message buffer from 8192
        unsigned char signon_buf[NET_MAXMESSAGE];
 
        /// connection flood blocking
@@ -230,7 +230,7 @@ typedef struct client_s
        /// ping_times[num_pings%NUM_PING_TIMES]
        int num_pings;
 #endif
-       /// LordHavoc: can be used for prediction or whatever...
+       /// LadyHavoc: can be used for prediction or whatever...
        float ping;
 
        /// this is used by sv_clmovement_minping code
@@ -335,6 +335,8 @@ typedef struct client_s
 #define MOVETYPE_FAKEPUSH              13              ///< tenebrae's push that doesn't push
 #define MOVETYPE_PHYSICS               32              ///< indicates this object is physics controlled
 #define MOVETYPE_FLY_WORLDONLY         33              ///< like MOVETYPE_FLY, but uses MOVE_WORLDONLY for all its traces; objects of this movetype better be SOLID_NOT or SOLID_TRIGGER please, or else...
+#define MOVETYPE_USER_FIRST            128             ///< user defined movetypes
+#define MOVETYPE_USER_LAST             191
 
 // edict->solid values
 #define        SOLID_NOT                               0               ///< no interaction with other objects
@@ -342,9 +344,9 @@ typedef struct client_s
 #define        SOLID_BBOX                              2               ///< touch on edge, block
 #define        SOLID_SLIDEBOX                  3               ///< touch on edge, but not an onground
 #define        SOLID_BSP                               4               ///< bsp clip, touch on edge, block
-// LordHavoc: corpse code
+// LadyHavoc: corpse code
 #define        SOLID_CORPSE                    5               ///< same as SOLID_BBOX, except it behaves as SOLID_NOT against SOLID_SLIDEBOX objects (players/monsters)
-// LordHavoc: physics
+// LadyHavoc: physics
 // VorteX: now these fields are deprecated, as geomtype is more flexible
 #define        SOLID_PHYSICS_BOX               32              ///< physics object (mins, maxs, mass, origin, axis_forward, axis_left, axis_up, velocity, spinvelocity)
 #define        SOLID_PHYSICS_SPHERE    33              ///< physics object (mins, maxs, mass, origin, axis_forward, axis_left, axis_up, velocity, spinvelocity)
@@ -402,7 +404,7 @@ extern cvar_t scratch2;
 extern cvar_t scratch3;
 extern cvar_t scratch4;
 extern cvar_t skill;
-extern cvar_t slowmo;
+extern cvar_t host_timescale;
 extern cvar_t sv_accelerate;
 extern cvar_t sv_aim;
 extern cvar_t sv_airaccel_qw;
@@ -575,12 +577,12 @@ qboolean SV_NudgeOutOfSolid(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
-trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, float extend);
-trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, float extend);
-trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int hitsupercontentsmask);
+trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, int skipsupercontentsmask, int skipmaterialflagsmask, float extend);
+trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, int skipsupercontentsmask, int skipmaterialflagsmask, float extend);
+trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int hitsupercontentsmask, int skipsupercontentsmask, int skipmaterialflagsmask);
 int SV_EntitiesInBox(const vec3_t mins, const vec3_t maxs, int maxedicts, prvm_edict_t **resultedicts);
 
-qboolean SV_CanSeeBox(int numsamples, vec_t enlarge, vec3_t eye, vec3_t entboxmins, vec3_t entboxmaxs);
+qboolean SV_CanSeeBox(int numsamples, vec_t eyejitter, vec_t enlarge, vec_t entboxexpand, vec3_t eye, vec3_t entboxmins, vec3_t entboxmaxs);
 
 int SV_PointSuperContents(const vec3_t point);