X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=world.h;h=59a01e8a8eac90d41d2859a55960be3dca0473b2;hb=0d314b60e27676e603dae93d056b9659e6bd63c1;hp=81c662ce93565df6fa49f842c930826255e66add;hpb=0256e57e16a302ad45090618b8d6eb5930788809;p=xonotic%2Fdarkplaces.git

diff --git a/world.h b/world.h
index 81c662ce..59a01e8a 100644
--- a/world.h
+++ b/world.h
@@ -24,36 +24,29 @@ 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
 
 
-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 (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 (edict_t *ent, qboolean touch_triggers);
 
-extern int SV_HullPointContents (hull_t *hull, int num, 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
-
-edict_t	*SV_TestEntityPosition (edict_t *ent);
+// returns true if the entity is in solid currently
+int SV_TestEntityPosition (edict_t *ent);
 
-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
@@ -63,6 +56,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, edict_t *passedict);
+
+int SV_PointQ1Contents(const vec3_t point);
+int SV_PointSuperContents(const vec3_t point);
 
 #endif