X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=world.h;h=e01b831c0ca8b00f89c26b2ee484ba9bc7ed1f22;hb=2965b15fe9f10b90420d1d7185e06eacb203d804;hp=10419be7650cf3acfafa0f6dae943beb5ad9c7cf;hpb=93bce2dbe64b734e74d721164369943fffe7e397;p=xonotic%2Fdarkplaces.git

diff --git a/world.h b/world.h
index 10419be7..e01b831c 100644
--- a/world.h
+++ b/world.h
@@ -24,9 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "collision.h"
 
-#define	MOVE_NORMAL		0
-#define	MOVE_NOMONSTERS	1
-#define	MOVE_MISSILE	2
+#define MOVE_NORMAL     0
+#define MOVE_NOMONSTERS 1
+#define MOVE_MISSILE    2
+#define MOVE_WORLDONLY  3
+#define MOVE_HITMODEL   4
 
 
 // called after the world model has been loaded, before linking any entities
@@ -34,15 +36,15 @@ void SV_ClearWorld (void);
 
 // call before removing an entity, and before trying to move one,
 // so it doesn't clip against itself
-void SV_UnlinkEdict (edict_t *ent);
+void SV_UnlinkEdict (prvm_edict_t *ent);
 
 // 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 (edict_t *ent, qboolean touch_triggers);
+void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers);
 
-// returns true if the entity is in solid currently
-int SV_TestEntityPosition (edict_t *ent);
+// returns list of entities touching a box
+int SV_EntitiesInBox(vec3_t mins, vec3_t maxs, int maxlist, prvm_edict_t **list);
 
 // mins and maxs are relative
 // if the entire move stays in a solid volume, trace.allsolid will be set
@@ -54,9 +56,9 @@ int SV_TestEntityPosition (edict_t *ent);
 // shouldn't be considered solid objects
 
 // passedict is explicitly excluded from clipping checks (normally NULL)
-trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, 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 SV_PointContents(const vec3_t point);
+#define SV_PointSuperContents(point) (SV_Move((point), vec3_origin, vec3_origin, (point), sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL).startsupercontents)
 
 #endif