X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=world.h;h=898926e864d915436ad781b25f16950c0ffd9174;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hp=624b94314a18c7b24cd431f3cd2a041b248b0a08;hpb=1019743b2072b60aa1a2897b04c7cbb8f94454d1;p=xonotic%2Fdarkplaces.git

diff --git a/world.h b/world.h
index 624b9431..898926e8 100644
--- a/world.h
+++ b/world.h
@@ -19,40 +19,37 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // world.h
 
+#ifndef WORLD_H
+#define WORLD_H
+
 #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
 
 
-void SV_ClearWorld (void);
 // called after the world model has been loaded, before linking any entities
+void SV_ClearWorld (void);
 
-void SV_UnlinkEdict (edict_t *ent);
 // call before removing an entity, and before trying to move one,
 // so it doesn't clip against itself
-// flags ent->v.modified
+void SV_UnlinkEdict (prvm_edict_t *ent);
 
-void SV_LinkEdict (edict_t *ent, qboolean touch_triggers);
 // Needs to be called any time an entity changes origin, mins, maxs, or solid
-// flags ent->v.modified
 // 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);
 
-extern int SV_HullPointContents (hull_t *hull, int num, vec3_t p);
-// LordHavoc: waste of time to wrap it
-//int SV_PointContents (vec3_t p);
-#define SV_PointContents(testpoint) SV_HullPointContents(&sv.worldmodel->hulls[0], 0, (testpoint))
-// returns the CONTENTS_* value from the world at the given point.
-// does not check any entities at all
-// the non-true version remaps the water current contents to content_water
+// returns true if the entity is in solid currently
+int SV_TestEntityPosition (prvm_edict_t *ent);
 
-edict_t	*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);
 
-trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict);
 // mins and maxs are relative
-
 // if the entire move stays in a solid volume, trace.allsolid will be set
 
 // if the starting point is in a solid, it will be allowed to move out
@@ -62,3 +59,10 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
 // shouldn't be considered solid objects
 
 // passedict is explicitly excluded from clipping checks (normally NULL)
+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_PointQ1Contents(const vec3_t point);
+int SV_PointSuperContents(const vec3_t point);
+
+#endif
+