more q3bsp work (and no it still doesn't work right)

[xonotic/darkplaces.git] / world.h

diff --git a/world.h b/world.h
index 55838dca58f57943901937f6837f84ae78c52da0..1e8486c7d51e326b3b1f2a0d4f4602657fac6d7d 100644 (file)
--- a/world.h
+++ b/world.h
@@ -19,59 +19,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // world.h
 
-typedef struct
-{
-       vec3_t  normal;
-       float   dist;
-} plane_t;
-
-typedef struct
-{
-       qboolean        allsolid;       // if true, plane is not valid
-       qboolean        startsolid;     // if true, the initial point was in a solid area
-       qboolean        inopen, inwater;
-       float   fraction;               // time completed, 1.0 = didn't hit anything
-       vec3_t  endpos;                 // final position
-       plane_t plane;                  // surface normal at impact
-       edict_t *ent;                   // entity the surface is on
-       int             startcontents;  // if not zero, treats this value as empty, and
-                                                       // all others as solid (impact on content change)
-       int             endcontents;    // set to the contents that was hit at the end point
-} trace_t;
-
-
-#define        MOVE_NORMAL             0
-#define        MOVE_NOMONSTERS 1
-#define        MOVE_MISSILE    2
+#ifndef WORLD_H
+#define WORLD_H
+
+#include "collision.h"
+
+#define MOVE_NORMAL     0
+#define MOVE_NOMONSTERS 1
+#define MOVE_MISSILE    2
+#define MOVE_WORLDONLY  3
 
 
-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);
-// 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
-
-edict_t        *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 reletive
+// returns true if the entity is in solid currently
+int SV_TestEntityPosition (edict_t *ent);
 
+// 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
@@ -81,22 +55,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_RecursiveHullCheck (int num, float p1f, float p2f, vec3_t p1, vec3_t p2);
-
-typedef struct
-{
-       hull_t *hull;
-       trace_t *trace;
-       vec3_t start;
-       vec3_t dist;
-}
-RecursiveHullCheckTraceInfo_t;
+int SV_PointQ1Contents(const vec3_t point);
+int SV_PointSuperContents(const vec3_t point);
 
-// LordHavoc: FIXME: this is not thread safe, if threading matters here, pass
-// this as a struct to RecursiveHullCheck, RecursiveHullCheck_Impact, etc...
-extern RecursiveHullCheckTraceInfo_t RecursiveHullCheckInfo;
+#endif
 
-// optimized variant of RecursiveHullCheck that only returns success/failure
-// FIXME: broken, fix it
-//extern qboolean SV_TestLine (hull_t *hull, int num, vec3_t p1, vec3_t p2);