X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=world.h;h=cbe9747ffb0b638307dec3283b917bf85ecdac40;hp=7d829946aecd199f7ebc49953085e11f923e3f56;hb=da678034f2cd88eff4b8f5c98ca628cd23893fe3;hpb=9ba80c169d244d56e90f437c512f827953cc1208

diff --git a/world.h b/world.h
index 7d829946..cbe9747f 100644
--- a/world.h
+++ b/world.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -19,67 +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;
+#ifndef WORLD_H
+#define WORLD_H
 
-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
-	// LordHavoc: added texture and lighting to traceline
-	char	*texturename;
-	vec3_t	light;
-} trace_t;
+#include "collision.h"
+
+#define MOVE_NORMAL     0
+#define MOVE_NOMONSTERS 1
+#define MOVE_MISSILE    2
+#define MOVE_WORLDONLY  3
+#define MOVE_HITMODEL   4
 
+#define AREA_GRID 512
+#define AREA_GRIDNODES (AREA_GRID * AREA_GRID)
 
-#define	MOVE_NORMAL		0
-#define	MOVE_NOMONSTERS	1
-#define	MOVE_MISSILE	2
+typedef struct link_s
+{
+	int entitynumber;
+	struct link_s	*prev, *next;
+} link_t;
 
+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;
+
+struct prvm_edict_s;
+
+// 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);
+
+void World_Init(void);
 
-void SV_ClearWorld (void);
 // called after the world model has been loaded, before linking any entities
+void World_Clear(world_t *world);
+
+void World_PrintAreaStats(world_t *world, const char *worldname);
 
-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_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
-
-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
-
-// if the entire move stays in a solid volume, trace.allsolid will be set
+void World_UnlinkEdict(struct prvm_edict_s *ent);
 
-// if the starting point is in a solid, it will be allowed to move out
-// to an open area
+// 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);
 
-// nomonsters is used for line of sight or edge testing, where mosnters
-// shouldn't be considered solid objects
+// 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);
 
-// passedict is explicitly excluded from clipping checks (normally NULL)
+#endif
 
-extern qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace);
\ No newline at end of file