World_EntitiesInBox now takes const mins/maxs

[xonotic/darkplaces.git] / world.h

diff --git a/world.h b/world.h
index 55838dca58f57943901937f6837f84ae78c52da0..cbe9747ffb0b638307dec3283b917bf85ecdac40 100644 (file)
--- a/world.h
+++ b/world.h
@@ -19,84 +19,66 @@ 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;
-
+#ifndef WORLD_H
+#define WORLD_H
 
-#define        MOVE_NORMAL             0
-#define        MOVE_NOMONSTERS 1
-#define        MOVE_MISSILE    2
+#include "collision.h"
 
+#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_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
+#define AREA_GRID 512
+#define AREA_GRIDNODES (AREA_GRID * AREA_GRID)
 
-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
+typedef struct link_s
+{
+       int entitynumber;
+       struct link_s   *prev, *next;
+} link_t;
 
-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
+typedef struct world_s
+{
+       int areagrid_stats_calls;
+       int areagrid_stats_nodechecks;
+       int areagrid_stats_entitychecks;
+
+       link_t areagrid[AREA_GRIDNODES];
+       link_t areagrid_outside;
+       vec3_t areagrid_bias;
+       vec3_t areagrid_scale;
+       vec3_t areagrid_mins;
+       vec3_t areagrid_maxs;
+       vec3_t areagrid_size;
+       int areagrid_marknumber;
+}
+world_t;
 
-edict_t        *SV_TestEntityPosition (edict_t *ent);
+struct prvm_edict_s;
 
-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
+// cyclic doubly-linked list functions
+void World_ClearLink(link_t *l);
+void World_RemoveLink(link_t *l);
+void World_InsertLinkBefore(link_t *l, link_t *before, int entitynumber);
 
-// if the entire move stays in a solid volume, trace.allsolid will be set
+void World_Init(void);
 
-// if the starting point is in a solid, it will be allowed to move out
-// to an open area
+// called after the world model has been loaded, before linking any entities
+void World_Clear(world_t *world);
 
-// nomonsters is used for line of sight or edge testing, where mosnters
-// shouldn't be considered solid objects
+void World_PrintAreaStats(world_t *world, const char *worldname);
 
-// passedict is explicitly excluded from clipping checks (normally NULL)
+// call before removing an entity, and before trying to move one,
+// so it doesn't clip against itself
+void World_UnlinkEdict(struct prvm_edict_s *ent);
 
-int SV_RecursiveHullCheck (int num, float p1f, float p2f, vec3_t p1, vec3_t p2);
+// Needs to be called any time an entity changes origin, mins, maxs
+void World_LinkEdict(world_t *world, struct prvm_edict_s *ent, const vec3_t mins, const vec3_t maxs);
 
-typedef struct
-{
-       hull_t *hull;
-       trace_t *trace;
-       vec3_t start;
-       vec3_t dist;
-}
-RecursiveHullCheckTraceInfo_t;
+// returns list of entities touching a box
+int World_EntitiesInBox(world_t *world, const vec3_t mins, const vec3_t maxs, int maxlist, struct prvm_edict_s **list);
 
-// 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);