X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=dff58cac4c8a503441191e46052db61029655a86;hb=81ab203d90dc99227801821479e837f772b00369;hp=ba73d8f2d55c4f4b362dd64e4c6479afb8655440;hpb=5fbf1b000aeab4cc583f562a35cf0dddef63aa52;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index ba73d8f2..dff58cac 100644
--- a/server.h
+++ b/server.h
@@ -112,6 +112,10 @@ typedef struct server_s
 	// note this is in server_t rather than server_static_t so that it is
 	// reset on each map command (such as New Game in singleplayer)
 	server_connectfloodaddress_t connectfloodaddresses[MAX_CONNECTFLOODADDRESSES];
+
+#define SV_MAX_PARTICLEEFFECTNAME 256
+	qboolean particleeffectnamesloaded;
+	char particleeffectname[SV_MAX_PARTICLEEFFECTNAME][MAX_QPATH];
 } server_t;
 
 // if defined this does ping smoothing, otherwise it does not
@@ -340,6 +344,8 @@ void SV_ReadClientMessage(void);
 int SV_ModelIndex(const char *s, int precachemode);
 int SV_SoundIndex(const char *s, int precachemode);
 
+int SV_ParticleEffectIndex(const char *name);
+
 void SV_SetIdealPitch (void);
 
 void SV_AddUpdates (void);
@@ -356,31 +362,19 @@ void SV_Physics_ClientEntity (prvm_edict_t *ent);
 
 qboolean SV_PlayerCheckGround (prvm_edict_t *ent);
 qboolean SV_CheckBottom (prvm_edict_t *ent);
-qboolean SV_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink);
+qboolean SV_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink, qboolean noenemy, qboolean settrace);
 
 // Needs to be called any time an entity changes origin, mins, maxs, or solid
 // sets ent->v.absmin and ent->v.absmax
 // if touchtriggers, calls prog functions for the intersected triggers
 void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers);
 
-// traces a box move against a single entity
-// mins and maxs are relative
-//
-// if the entire move stays in a single solid brush, trace.allsolid will be set
-//
-// if the starting point is in a solid, it will be allowed to move out to an
-// open area, and trace.startsolid will be set
-//
-// type is one of the MOVE_ values such as MOVE_NOMONSTERS which skips box
-// entities, only colliding with SOLID_BSP entities (doors, lifts)
-//
-// passedict is excluded from clipping checks
-struct trace_s SV_Move_ClipToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents);
-
+// 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_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict);
+trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask);
 
-#define SV_PointSuperContents(point) (SV_Move((point), vec3_origin, vec3_origin, (point), sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL).startsupercontents)
+#define SV_PointSuperContents(point) (SV_Move((point), vec3_origin, vec3_origin, (point), sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL, 0).startsupercontents)
 
 void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats);