X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=world.c;h=8195fa762c9c9e0d46c73167786818dc1f2adf46;hb=f8db5fccbefee035971e5a8dd23d27cfe77944cd;hp=7505c86f4003f149ba2915f4269f929fbd8079a2;hpb=49103816aa305086338c024347d7b461c4d3de06;p=xonotic%2Fdarkplaces.git

diff --git a/world.c b/world.c
index 7505c86f..8195fa76 100644
--- a/world.c
+++ b/world.c
@@ -29,79 +29,43 @@ line of sight checks trace->inopen and trace->inwater, but bullets don't
 
 */
 
-cvar_t sv_useareanodes = {CVAR_NOTIFY, "sv_useareanodes", "1"};
-cvar_t sv_polygoncollisions = {CVAR_NOTIFY, "sv_polygoncollisions", "0"};
+cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0", "disables collision detection optimizations for debugging purposes"};
+cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "64", "minimum areagrid cell size, smaller values work better for lots of small objects, higher values for large objects"};
+
+void SV_AreaStats_f(void);
 
 void SV_World_Init(void)
 {
-	Cvar_RegisterVariable(&sv_useareanodes);
-	Cvar_RegisterVariable(&sv_polygoncollisions);
+	Cvar_RegisterVariable(&sv_debugmove);
+	Cvar_RegisterVariable(&sv_areagrid_mingridsize);
+	Cmd_AddCommand("sv_areastats", SV_AreaStats_f, "prints information on culling grid system");
 	Collision_Init();
 }
 
-typedef struct
-{
-	// bounding box of entire move area
-	vec3_t boxmins, boxmaxs;
-
-	// size of the moving object
-	vec3_t mins, maxs;
-
-	// size when clipping against monsters
-	vec3_t mins2, maxs2;
-
-	// size when clipping against brush models
-	vec3_t hullmins, hullmaxs;
-
-	// start and end origin of move
-	vec3_t start, end;
-
-	// trace results
-	trace_t trace;
-
-	// type of move (like ignoring monsters, or similar)
-	int type;
-
-	// the edict that is moving (if any)
-	edict_t *passedict;
-}
-moveclip_t;
-
-//#define EDICT_FROM_AREA(l) ((edict_t *)((qbyte *)l - (int)&(((edict_t *)0)->area)))
-#define EDICT_FROM_AREA(l) ((edict_t *)l->entity)
-
 //============================================================================
 
 // ClearLink is used for new headnodes
-void ClearLink (link_t *l)
+static void ClearLink (link_t *l)
 {
-	l->entity = NULL;
+	l->entitynumber = 0;
 	l->prev = l->next = l;
 }
 
-void RemoveLink (link_t *l)
+static void RemoveLink (link_t *l)
 {
 	l->next->prev = l->prev;
 	l->prev->next = l->next;
 }
 
-void InsertLinkBefore (link_t *l, link_t *before, void *ent)
+static void InsertLinkBefore (link_t *l, link_t *before, int entitynumber)
 {
-	l->entity = ent;
+	l->entitynumber = entitynumber;
 	l->next = before;
 	l->prev = before->prev;
 	l->prev->next = l;
 	l->next->prev = l;
 }
 
-void InsertLinkAfter (link_t *l, link_t *after)
-{
-	l->next = after->next;
-	l->prev = after;
-	l->prev->next = l;
-	l->next->prev = l;
-}
-
 
 /*
 ===============================================================================
@@ -111,92 +75,56 @@ ENTITY AREA CHECKING
 ===============================================================================
 */
 
-typedef struct areanode_s
-{
-	// -1 = leaf node
-	int axis;
-	float dist;
-	struct areanode_s *children[2];
-	link_t trigger_edicts;
-	link_t solid_edicts;
-}
-areanode_t;
-
-#define AREA_DEPTH 1
-#define AREA_NODES (1 << (AREA_DEPTH + 1))
-
-static areanode_t sv_areanodes[AREA_NODES];
-static int sv_numareanodes;
-
-/*
-===============
-SV_CreateAreaNode
+int sv_areagrid_stats_calls = 0;
+int sv_areagrid_stats_nodechecks = 0;
+int sv_areagrid_stats_entitychecks = 0;
 
-===============
-*/
-areanode_t *SV_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
+void SV_AreaStats_f(void)
 {
-	areanode_t *anode;
-	vec3_t size, mins1, maxs1, mins2, maxs2;
-
-	anode = &sv_areanodes[sv_numareanodes];
-	sv_numareanodes++;
-
-	ClearLink (&anode->trigger_edicts);
-	ClearLink (&anode->solid_edicts);
-
-	if (depth == AREA_DEPTH)
-	{
-		anode->axis = -1;
-		anode->children[0] = anode->children[1] = NULL;
-		return anode;
-	}
-
-	VectorSubtract (maxs, mins, size);
-	if (size[0] > size[1])
-		anode->axis = 0;
-	else
-		anode->axis = 1;
-
-	anode->dist = 0.5 * (maxs[anode->axis] + mins[anode->axis]);
-	VectorCopy (mins, mins1);
-	VectorCopy (mins, mins2);
-	VectorCopy (maxs, maxs1);
-	VectorCopy (maxs, maxs2);
-
-	maxs1[anode->axis] = mins2[anode->axis] = anode->dist;
-
-	anode->children[0] = SV_CreateAreaNode (depth+1, mins2, maxs2);
-	anode->children[1] = SV_CreateAreaNode (depth+1, mins1, maxs1);
-
-	return anode;
+	Con_Printf("areagrid check stats: %d calls %d nodes (%f per call) %d entities (%f per call)\n", sv_areagrid_stats_calls, sv_areagrid_stats_nodechecks, (double) sv_areagrid_stats_nodechecks / (double) sv_areagrid_stats_calls, sv_areagrid_stats_entitychecks, (double) sv_areagrid_stats_entitychecks / (double) sv_areagrid_stats_calls);
+	sv_areagrid_stats_calls = 0;
+	sv_areagrid_stats_nodechecks = 0;
+	sv_areagrid_stats_entitychecks = 0;
 }
 
 typedef struct areagrid_s
 {
-	link_t trigger_edicts;
-	link_t solid_edicts;
+	link_t edicts;
 }
 areagrid_t;
 
-#define AREA_GRID 32
+#define AREA_GRID 512
 #define AREA_GRIDNODES (AREA_GRID * AREA_GRID)
 
-static areagrid_t sv_areagrid[AREA_GRIDNODES];
-static vec3_t sv_areagridbias, sv_areagridscale;
+static areagrid_t sv_areagrid[AREA_GRIDNODES], sv_areagrid_outside;
+static vec3_t sv_areagrid_bias, sv_areagrid_scale, sv_areagrid_mins, sv_areagrid_maxs, sv_areagrid_size;
+static int sv_areagrid_marknumber = 1;
 
 void SV_CreateAreaGrid (vec3_t mins, vec3_t maxs)
 {
 	int i;
-	VectorNegate(mins, sv_areagridbias);
-	sv_areagridscale[0] = AREA_GRID / (maxs[0] + sv_areagridbias[0]);
-	sv_areagridscale[1] = AREA_GRID / (maxs[1] + sv_areagridbias[1]);
-	sv_areagridscale[2] = AREA_GRID / (maxs[2] + sv_areagridbias[2]);
+	ClearLink (&sv_areagrid_outside.edicts);
+	// choose either the world box size, or a larger box to ensure the grid isn't too fine
+	sv_areagrid_size[0] = max(maxs[0] - mins[0], AREA_GRID * sv_areagrid_mingridsize.value);
+	sv_areagrid_size[1] = max(maxs[1] - mins[1], AREA_GRID * sv_areagrid_mingridsize.value);
+	sv_areagrid_size[2] = max(maxs[2] - mins[2], AREA_GRID * sv_areagrid_mingridsize.value);
+	// figure out the corners of such a box, centered at the center of the world box
+	sv_areagrid_mins[0] = (mins[0] + maxs[0] - sv_areagrid_size[0]) * 0.5f;
+	sv_areagrid_mins[1] = (mins[1] + maxs[1] - sv_areagrid_size[1]) * 0.5f;
+	sv_areagrid_mins[2] = (mins[2] + maxs[2] - sv_areagrid_size[2]) * 0.5f;
+	sv_areagrid_maxs[0] = (mins[0] + maxs[0] + sv_areagrid_size[0]) * 0.5f;
+	sv_areagrid_maxs[1] = (mins[1] + maxs[1] + sv_areagrid_size[1]) * 0.5f;
+	sv_areagrid_maxs[2] = (mins[2] + maxs[2] + sv_areagrid_size[2]) * 0.5f;
+	// now calculate the actual useful info from that
+	VectorNegate(sv_areagrid_mins, sv_areagrid_bias);
+	sv_areagrid_scale[0] = AREA_GRID / sv_areagrid_size[0];
+	sv_areagrid_scale[1] = AREA_GRID / sv_areagrid_size[1];
+	sv_areagrid_scale[2] = AREA_GRID / sv_areagrid_size[2];
 	for (i = 0;i < AREA_GRIDNODES;i++)
 	{
-		ClearLink (&sv_areagrid[i].trigger_edicts);
-		ClearLink (&sv_areagrid[i].solid_edicts);
+		ClearLink (&sv_areagrid[i].edicts);
 	}
+	Con_DPrintf("sv_areagrid settings: divisions %ix%ix1 : box %f %f %f : %f %f %f size %f %f %f grid %f %f %f (mingrid %f)\n", AREA_GRID, AREA_GRID, sv_areagrid_mins[0], sv_areagrid_mins[1], sv_areagrid_mins[2], sv_areagrid_maxs[0], sv_areagrid_maxs[1], sv_areagrid_maxs[2], sv_areagrid_size[0], sv_areagrid_size[1], sv_areagrid_size[2], 1.0f / sv_areagrid_scale[0], 1.0f / sv_areagrid_scale[1], 1.0f / sv_areagrid_scale[2], sv_areagrid_mingridsize.value);
 }
 
 /*
@@ -207,10 +135,6 @@ SV_ClearWorld
 */
 void SV_ClearWorld (void)
 {
-	memset(sv_areanodes, 0, sizeof(sv_areanodes));
-	sv_numareanodes = 0;
-	Mod_CheckLoaded(sv.worldmodel);
-	SV_CreateAreaNode(0, sv.worldmodel->normalmins, sv.worldmodel->normalmaxs);
 	SV_CreateAreaGrid(sv.worldmodel->normalmins, sv.worldmodel->normalmaxs);
 }
 
@@ -221,99 +145,35 @@ SV_UnlinkEdict
 
 ===============
 */
-void SV_UnlinkEdict (edict_t *ent)
+void SV_UnlinkEdict (prvm_edict_t *ent)
 {
 	int i;
 	for (i = 0;i < ENTITYGRIDAREAS;i++)
 	{
-		if (ent->areagrid[i].prev)
-		{
-			RemoveLink (&ent->areagrid[i]);
-			ent->areagrid[i].prev = ent->areagrid[i].next = NULL;
-		}
-	}
-	if (ent->area.prev)
-	{
-		RemoveLink (&ent->area);
-		ent->area.prev = ent->area.next = NULL;
-	}
-}
-
-
-/*
-====================
-SV_TouchAreaNodes
-====================
-*/
-void SV_TouchAreaNodes ( edict_t *ent, areanode_t *node )
-{
-	link_t *l, *next;
-	edict_t *touch;
-	int old_self, old_other;
-
-loc0:
-// touch linked edicts
-	for (l = node->trigger_edicts.next ; l != &node->trigger_edicts ; l = next)
-	{
-		next = l->next;
-		touch = EDICT_FROM_AREA(l);
-		if (touch == ent)
-			continue;
-		if (!touch->v->touch || touch->v->solid != SOLID_TRIGGER)
-			continue;
-		if (ent->v->absmin[0] > touch->v->absmax[0]
-		 || ent->v->absmin[1] > touch->v->absmax[1]
-		 || ent->v->absmin[2] > touch->v->absmax[2]
-		 || ent->v->absmax[0] < touch->v->absmin[0]
-		 || ent->v->absmax[1] < touch->v->absmin[1]
-		 || ent->v->absmax[2] < touch->v->absmin[2])
-			continue;
-		old_self = pr_global_struct->self;
-		old_other = pr_global_struct->other;
-
-		pr_global_struct->self = EDICT_TO_PROG(touch);
-		pr_global_struct->other = EDICT_TO_PROG(ent);
-		pr_global_struct->time = sv.time;
-		PR_ExecuteProgram (touch->v->touch, "");
-
-		pr_global_struct->self = old_self;
-		pr_global_struct->other = old_other;
-	}
-
-// recurse down both sides
-	if (node->axis == -1)
-		return;
-
-	if (ent->v->absmax[node->axis] > node->dist)
-	{
-		if (ent->v->absmin[node->axis] < node->dist)
-			SV_TouchAreaNodes(ent, node->children[1]); // order reversed to reduce code
-		node = node->children[0];
-		goto loc0;
-	}
-	else
-	{
-		if (ent->v->absmin[node->axis] < node->dist)
+		if (ent->priv.server->areagrid[i].prev)
 		{
-			node = node->children[1];
-			goto loc0;
+			RemoveLink (&ent->priv.server->areagrid[i]);
+			ent->priv.server->areagrid[i].prev = ent->priv.server->areagrid[i].next = NULL;
 		}
 	}
 }
 
-void SV_TouchAreaGrid(edict_t *ent, areanode_t *node)
+int SV_EntitiesInBox(vec3_t mins, vec3_t maxs, int maxlist, prvm_edict_t **list)
 {
-	link_t *l, *next;
-	edict_t *touch;
+	int numlist;
 	areagrid_t *grid;
-	int old_self, old_other, igrid[3], igridmins[3], igridmaxs[3];
-
-	igridmins[0] = (int) ((ent->v->absmin[0] + sv_areagridbias[0]) * sv_areagridscale[0]);
-	igridmins[1] = (int) ((ent->v->absmin[1] + sv_areagridbias[1]) * sv_areagridscale[1]);
-	//igridmins[2] = (int) ((ent->v->absmin[2] + sv_areagridbias[2]) * sv_areagridscale[2]);
-	igridmaxs[0] = (int) ((ent->v->absmax[0] + sv_areagridbias[0]) * sv_areagridscale[0]) + 1;
-	igridmaxs[1] = (int) ((ent->v->absmax[1] + sv_areagridbias[1]) * sv_areagridscale[1]) + 1;
-	//igridmaxs[2] = (int) ((ent->v->absmax[2] + sv_areagridbias[2]) * sv_areagridscale[2]) + 1;
+	link_t *l;
+	prvm_edict_t *ent;
+	int igrid[3], igridmins[3], igridmaxs[3];
+
+	sv_areagrid_stats_calls++;
+	sv_areagrid_marknumber++;
+	igridmins[0] = (int) floor((mins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
+	igridmins[1] = (int) floor((mins[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
+	//igridmins[2] = (int) ((mins[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
+	igridmaxs[0] = (int) floor((maxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
+	igridmaxs[1] = (int) floor((maxs[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
+	//igridmaxs[2] = (int) ((maxs[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
 	igridmins[0] = max(0, igridmins[0]);
 	igridmins[1] = max(0, igridmins[1]);
 	//igridmins[2] = max(0, igridmins[2]);
@@ -321,93 +181,120 @@ void SV_TouchAreaGrid(edict_t *ent, areanode_t *node)
 	igridmaxs[1] = min(AREA_GRID, igridmaxs[1]);
 	//igridmaxs[2] = min(AREA_GRID, igridmaxs[2]);
 
+	numlist = 0;
+	// add entities not linked into areagrid because they are too big or
+	// outside the grid bounds
+	if (sv_areagrid_outside.edicts.next != &sv_areagrid_outside.edicts)
+	{
+		for (l = sv_areagrid_outside.edicts.next;l != &sv_areagrid_outside.edicts;l = l->next)
+		{
+			ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber);
+			if (ent->priv.server->areagridmarknumber != sv_areagrid_marknumber)
+			{
+				ent->priv.server->areagridmarknumber = sv_areagrid_marknumber;
+				if (!ent->priv.server->free && BoxesOverlap(mins, maxs, ent->fields.server->absmin, ent->fields.server->absmax))
+				{
+					if (numlist < maxlist)
+						list[numlist] = ent;
+					numlist++;
+				}
+				sv_areagrid_stats_entitychecks++;
+			}
+		}
+	}
+	// add grid linked entities
 	for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
 	{
 		grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0];
 		for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
 		{
-			for (l = grid->trigger_edicts.next;l != &grid->trigger_edicts;l = next)
+			if (grid->edicts.next != &grid->edicts)
 			{
-				next = l->next;
-				touch = EDICT_FROM_AREA(l);
-				if (touch == ent)
-					continue;
-				if (!touch->v->touch || touch->v->solid != SOLID_TRIGGER)
-					continue;
-				if (ent->v->absmin[0] > touch->v->absmax[0]
-				 || ent->v->absmin[1] > touch->v->absmax[1]
-				 || ent->v->absmin[2] > touch->v->absmax[2]
-				 || ent->v->absmax[0] < touch->v->absmin[0]
-				 || ent->v->absmax[1] < touch->v->absmin[1]
-				 || ent->v->absmax[2] < touch->v->absmin[2])
-					continue;
-				old_self = pr_global_struct->self;
-				old_other = pr_global_struct->other;
-
-				pr_global_struct->self = EDICT_TO_PROG(touch);
-				pr_global_struct->other = EDICT_TO_PROG(ent);
-				pr_global_struct->time = sv.time;
-				PR_ExecuteProgram (touch->v->touch, "");
-
-				pr_global_struct->self = old_self;
-				pr_global_struct->other = old_other;
+				for (l = grid->edicts.next;l != &grid->edicts;l = l->next)
+				{
+					ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber);
+					if (ent->priv.server->areagridmarknumber != sv_areagrid_marknumber)
+					{
+						ent->priv.server->areagridmarknumber = sv_areagrid_marknumber;
+						if (!ent->priv.server->free && BoxesOverlap(mins, maxs, ent->fields.server->absmin, ent->fields.server->absmax))
+						{
+							if (numlist < maxlist)
+								list[numlist] = ent;
+							numlist++;
+						}
+						//	Con_Printf("%d %f %f %f %f %f %f : %d : %f %f %f %f %f %f\n", BoxesOverlap(mins, maxs, ent->fields.server->absmin, ent->fields.server->absmax), ent->fields.server->absmin[0], ent->fields.server->absmin[1], ent->fields.server->absmin[2], ent->fields.server->absmax[0], ent->fields.server->absmax[1], ent->fields.server->absmax[2], PRVM_NUM_FOR_EDICT(ent), mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2]);
+					}
+					sv_areagrid_stats_entitychecks++;
+				}
 			}
 		}
 	}
+	return numlist;
 }
 
-void SV_LinkEdict_AreaNode(edict_t *ent)
+void SV_TouchAreaGrid(prvm_edict_t *ent)
 {
-	areanode_t *node;
-	// find the first node that the ent's box crosses
-	node = sv_areanodes;
-	while (1)
+	int i, numtouchedicts, old_self, old_other;
+	prvm_edict_t *touch, *touchedicts[MAX_EDICTS];
+
+	// build a list of edicts to touch, because the link loop can be corrupted
+	// by SV_IncreaseEdicts called during touch functions
+	numtouchedicts = SV_EntitiesInBox(ent->fields.server->absmin, ent->fields.server->absmax, MAX_EDICTS, touchedicts);
+	if (numtouchedicts > MAX_EDICTS)
 	{
-		if (node->axis == -1)
-			break;
-		if (ent->v->absmin[node->axis] > node->dist)
-			node = node->children[0];
-		else if (ent->v->absmax[node->axis] < node->dist)
-			node = node->children[1];
-		else
-			break;		// crosses the node
+		// this never happens
+		Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+		numtouchedicts = MAX_EDICTS;
 	}
 
-	// link it in
-
-	if (ent->v->solid == SOLID_TRIGGER)
-		InsertLinkBefore (&ent->area, &node->trigger_edicts, ent);
-	else
-		InsertLinkBefore (&ent->area, &node->solid_edicts, ent);
+	old_self = prog->globals.server->self;
+	old_other = prog->globals.server->other;
+	for (i = 0;i < numtouchedicts;i++)
+	{
+		touch = touchedicts[i];
+		if (touch != ent && (int)touch->fields.server->solid == SOLID_TRIGGER && touch->fields.server->touch)
+		{
+			prog->globals.server->self = PRVM_EDICT_TO_PROG(touch);
+			prog->globals.server->other = PRVM_EDICT_TO_PROG(ent);
+			prog->globals.server->time = sv.time;
+			PRVM_ExecuteProgram (touch->fields.server->touch, "QC function self.touch is missing");
+		}
+	}
+	prog->globals.server->self = old_self;
+	prog->globals.server->other = old_other;
 }
 
-int SV_LinkEdict_AreaGrid(edict_t *ent)
+void SV_LinkEdict_AreaGrid(prvm_edict_t *ent)
 {
 	areagrid_t *grid;
-	int igrid[3], igridmins[3], igridmaxs[3], gridnum;
-
-	igridmins[0] = (int) ((ent->v->absmin[0] + sv_areagridbias[0]) * sv_areagridscale[0]);
-	igridmins[1] = (int) ((ent->v->absmin[1] + sv_areagridbias[1]) * sv_areagridscale[1]);
-	//igridmins[2] = (int) ((ent->v->absmin[2] + sv_areagridbias[2]) * sv_areagridscale[2]);
-	igridmaxs[0] = (int) ((ent->v->absmax[0] + sv_areagridbias[0]) * sv_areagridscale[0]) + 1;
-	igridmaxs[1] = (int) ((ent->v->absmax[1] + sv_areagridbias[1]) * sv_areagridscale[1]) + 1;
-	//igridmaxs[2] = (int) ((ent->v->absmax[2] + sv_areagridbias[2]) * sv_areagridscale[2]) + 1;
+	int igrid[3], igridmins[3], igridmaxs[3], gridnum, entitynumber = PRVM_NUM_FOR_EDICT(ent);
+
+	if (entitynumber <= 0 || entitynumber >= prog->max_edicts || PRVM_EDICT_NUM(entitynumber) != ent)
+	{
+		Con_Printf ("SV_LinkEdict_AreaGrid: invalid edict %p (edicts is %p, edict compared to prog->edicts is %i)\n", ent, prog->edicts, entitynumber);
+		return;
+	}
+
+	igridmins[0] = (int) floor((ent->fields.server->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
+	igridmins[1] = (int) floor((ent->fields.server->absmin[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
+	//igridmins[2] = (int) ((ent->fields.server->absmin[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
+	igridmaxs[0] = (int) floor((ent->fields.server->absmax[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
+	igridmaxs[1] = (int) floor((ent->fields.server->absmax[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
+	//igridmaxs[2] = (int) ((ent->fields.server->absmax[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
 	if (igridmins[0] < 0 || igridmaxs[0] > AREA_GRID || igridmins[1] < 0 || igridmaxs[1] > AREA_GRID || ((igridmaxs[0] - igridmins[0]) * (igridmaxs[1] - igridmins[1])) > ENTITYGRIDAREAS)
-		return false;
+	{
+		// wow, something outside the grid, store it as such
+		InsertLinkBefore (&ent->priv.server->areagrid[0], &sv_areagrid_outside.edicts, entitynumber);
+		return;
+	}
 
 	gridnum = 0;
 	for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
 	{
 		grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0];
 		for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++, gridnum++)
-		{
-			if (ent->v->solid == SOLID_TRIGGER)
-				InsertLinkBefore (&ent->areagrid[gridnum], &grid->trigger_edicts, ent);
-			else
-				InsertLinkBefore (&ent->areagrid[gridnum], &grid->solid_edicts, ent);
-		}
+			InsertLinkBefore (&ent->priv.server->areagrid[gridnum], &grid->edicts, entitynumber);
 	}
-	return true;
 }
 
 /*
@@ -416,98 +303,94 @@ SV_LinkEdict
 
 ===============
 */
-void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
+void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
 {
 	model_t *model;
 
-	if (ent->area.prev || ent->areagrid[0].prev)
+	if (ent->priv.server->areagrid[0].prev)
 		SV_UnlinkEdict (ent);	// unlink from old position
 
-	if (ent == sv.edicts)
+	if (ent == prog->edicts)
 		return;		// don't add the world
 
-	if (ent->free)
+	if (ent->priv.server->free)
 		return;
 
 // set the abs box
 
-	if (ent->v->solid == SOLID_BSP)
+	if (ent->fields.server->solid == SOLID_BSP)
 	{
-		if (ent->v->modelindex < 0 || ent->v->modelindex > MAX_MODELS)
-			Host_Error("SOLID_BSP with invalid modelindex!\n");
-		model = sv.models[(int) ent->v->modelindex];
+		int modelindex = ent->fields.server->modelindex;
+		if (modelindex < 0 || modelindex > MAX_MODELS)
+		{
+			Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
+			modelindex = 0;
+		}
+		model = sv.models[modelindex];
 		if (model != NULL)
 		{
-			if (model->type != mod_brush)
-				Host_Error("SOLID_BSP with non-BSP model\n");
+			if (!model->TraceBox)
+				Con_Printf("edict %i: SOLID_BSP with non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
 
-			if (ent->v->angles[0] || ent->v->angles[2] || ent->v->avelocity[0] || ent->v->avelocity[2])
+			if (ent->fields.server->angles[0] || ent->fields.server->angles[2] || ent->fields.server->avelocity[0] || ent->fields.server->avelocity[2])
 			{
-				VectorAdd(ent->v->origin, model->rotatedmins, ent->v->absmin);
-				VectorAdd(ent->v->origin, model->rotatedmaxs, ent->v->absmax);
+				VectorAdd(ent->fields.server->origin, model->rotatedmins, ent->fields.server->absmin);
+				VectorAdd(ent->fields.server->origin, model->rotatedmaxs, ent->fields.server->absmax);
 			}
-			else if (ent->v->angles[1] || ent->v->avelocity[1])
+			else if (ent->fields.server->angles[1] || ent->fields.server->avelocity[1])
 			{
-				VectorAdd(ent->v->origin, model->yawmins, ent->v->absmin);
-				VectorAdd(ent->v->origin, model->yawmaxs, ent->v->absmax);
+				VectorAdd(ent->fields.server->origin, model->yawmins, ent->fields.server->absmin);
+				VectorAdd(ent->fields.server->origin, model->yawmaxs, ent->fields.server->absmax);
 			}
 			else
 			{
-				VectorAdd(ent->v->origin, model->normalmins, ent->v->absmin);
-				VectorAdd(ent->v->origin, model->normalmaxs, ent->v->absmax);
+				VectorAdd(ent->fields.server->origin, model->normalmins, ent->fields.server->absmin);
+				VectorAdd(ent->fields.server->origin, model->normalmaxs, ent->fields.server->absmax);
 			}
 		}
 		else
 		{
 			// SOLID_BSP with no model is valid, mainly because some QC setup code does so temporarily
-			VectorAdd(ent->v->origin, ent->v->mins, ent->v->absmin);
-			VectorAdd(ent->v->origin, ent->v->maxs, ent->v->absmax);
+			VectorAdd(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->absmin);
+			VectorAdd(ent->fields.server->origin, ent->fields.server->maxs, ent->fields.server->absmax);
 		}
 	}
 	else
 	{
-		VectorAdd(ent->v->origin, ent->v->mins, ent->v->absmin);
-		VectorAdd(ent->v->origin, ent->v->maxs, ent->v->absmax);
+		VectorAdd(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->absmin);
+		VectorAdd(ent->fields.server->origin, ent->fields.server->maxs, ent->fields.server->absmax);
 	}
 
 //
 // to make items easier to pick up and allow them to be grabbed off
 // of shelves, the abs sizes are expanded
 //
-	if ((int)ent->v->flags & FL_ITEM)
+	if ((int)ent->fields.server->flags & FL_ITEM)
 	{
-		ent->v->absmin[0] -= 15;
-		ent->v->absmin[1] -= 15;
-		ent->v->absmin[2] -= 1;
-		ent->v->absmax[0] += 15;
-		ent->v->absmax[1] += 15;
-		ent->v->absmax[2] += 1;
+		ent->fields.server->absmin[0] -= 15;
+		ent->fields.server->absmin[1] -= 15;
+		ent->fields.server->absmin[2] -= 1;
+		ent->fields.server->absmax[0] += 15;
+		ent->fields.server->absmax[1] += 15;
+		ent->fields.server->absmax[2] += 1;
 	}
 	else
 	{
 		// because movement is clipped an epsilon away from an actual edge,
 		// we must fully check even when bounding boxes don't quite touch
-		ent->v->absmin[0] -= 1;
-		ent->v->absmin[1] -= 1;
-		ent->v->absmin[2] -= 1;
-		ent->v->absmax[0] += 1;
-		ent->v->absmax[1] += 1;
-		ent->v->absmax[2] += 1;
+		ent->fields.server->absmin[0] -= 1;
+		ent->fields.server->absmin[1] -= 1;
+		ent->fields.server->absmin[2] -= 1;
+		ent->fields.server->absmax[0] += 1;
+		ent->fields.server->absmax[1] += 1;
+		ent->fields.server->absmax[2] += 1;
 	}
 
-	if (ent->v->solid == SOLID_NOT)
-		return;
-
-	// try to link into areagrid, if that fails fall back on areanode
-	if (!SV_LinkEdict_AreaGrid(ent))
-		SV_LinkEdict_AreaNode(ent);
+	SV_LinkEdict_AreaGrid(ent);
 
 // if touch_triggers, touch all entities at this node and descend for more
-	if (touch_triggers)
-	{
-		SV_TouchAreaNodes(ent, sv_areanodes);
-		SV_TouchAreaGrid(ent, sv_areanodes);
-	}
+	if (touch_triggers && ent->fields.server->solid != SOLID_NOT)
+		SV_TouchAreaGrid(ent);
 }
 
 
@@ -527,9 +410,9 @@ SV_TestEntityPosition
 This could be a lot more efficient...
 ============
 */
-int SV_TestEntityPosition (edict_t *ent)
+int SV_TestEntityPosition (prvm_edict_t *ent)
 {
-	return SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, ent->v->origin, MOVE_NORMAL, ent).startsolid;
+	return SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, MOVE_NORMAL, ent).startsolid;
 }
 
 
@@ -549,346 +432,309 @@ Handles selection or creation of a clipping hull, and offseting (and
 eventually rotation) of the end points
 ==================
 */
-trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end)
+trace_t SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents)
 {
-	int i;
 	trace_t trace;
-	model_t *model;
+	model_t *model = NULL;
+	matrix4x4_t matrix, imatrix;
+	float tempnormal[3], starttransformed[3], endtransformed[3];
+	float starttransformedmins[3], starttransformedmaxs[3], endtransformedmins[3], endtransformedmaxs[3];
 
-	i = ent->v->modelindex;
-	if ((unsigned int) i >= MAX_MODELS)
-		Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
-	model = sv.models[i];
-	if (i != 0 && model == NULL)
-		Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
+	memset(&trace, 0, sizeof(trace));
+	trace.fraction = trace.realfraction = 1;
+	VectorCopy(end, trace.endpos);
 
-	if ((int) ent->v->solid == SOLID_BSP)
+	if ((int) ent->fields.server->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
 	{
-		Mod_CheckLoaded(model);
-		if (model->type != mod_brush)
+		unsigned int modelindex = ent->fields.server->modelindex;
+		// if the modelindex is 0, it shouldn't be SOLID_BSP!
+		if (modelindex == 0)
 		{
-			Con_Printf ("SV_ClipMoveToEntity: SOLID_BSP with a non bsp model, entity dump:\n");
-			ED_Print (ent);
-			Host_Error ("SV_ClipMoveToEntity: SOLID_BSP with a non bsp model\n");
+			Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with no model\n", PRVM_NUM_FOR_EDICT(ent));
+			return trace;
 		}
-		if (ent->v->movetype != MOVETYPE_PUSH)
-			Host_Error ("SV_ClipMoveToEntity: SOLID_BSP without MOVETYPE_PUSH");
-	}
-
-	if (sv_polygoncollisions.integer && (mins[0] != maxs[0] || mins[1] != maxs[1] || mins[2] != maxs[2]))
-		Collision_PolygonClipTrace(&trace, ent, model, ent->v->origin, ent->v->angles, ent->v->mins, ent->v->maxs, start, mins, maxs, end);
-	else
-		Collision_ClipTrace(&trace, ent, model, ent->v->origin, ent->v->angles, ent->v->mins, ent->v->maxs, start, mins, maxs, end);
-
-	return trace;
-}
-
-//===========================================================================
-
-/*
-====================
-SV_ClipToAreaNodes
-
-Mins and maxs enclose the entire area swept by the move
-====================
-*/
-void SV_ClipToAreaNodes ( areanode_t *node, moveclip_t *clip )
-{
-	link_t *l, *next;
-	edict_t *touch;
-	trace_t trace;
-
-loc0:
-	if (clip->trace.allsolid)
-		return;
-// touch linked edicts
-	for (l = node->solid_edicts.next ; l != &node->solid_edicts ; l = next)
-	{
-		next = l->next;
-		touch = EDICT_FROM_AREA(l);
-		if (touch->v->solid == SOLID_NOT)
-			continue;
-		if (touch == clip->passedict)
-			continue;
-		if (touch->v->solid == SOLID_TRIGGER)
+		if (modelindex >= MAX_MODELS)
 		{
-			ED_Print(touch);
-			Host_Error ("Trigger in clipping list");
+			Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", PRVM_NUM_FOR_EDICT(ent));
+			return trace;
 		}
-
-		if (clip->type == MOVE_NOMONSTERS && touch->v->solid != SOLID_BSP)
-			continue;
-
-		if (clip->boxmins[0] > touch->v->absmax[0]
-		 || clip->boxmaxs[0] < touch->v->absmin[0]
-		 || clip->boxmins[1] > touch->v->absmax[1]
-		 || clip->boxmaxs[1] < touch->v->absmin[1]
-		 || clip->boxmins[2] > touch->v->absmax[2]
-		 || clip->boxmaxs[2] < touch->v->absmin[2])
-			continue;
-
-		if (clip->passedict)
+		model = sv.models[modelindex];
+		if (modelindex != 0 && model == NULL)
 		{
-			if (clip->passedict->v->size[0] && !touch->v->size[0])
-				continue;	// points never interact
-		 	if (PROG_TO_EDICT(touch->v->owner) == clip->passedict)
-				continue;	// don't clip against own missiles
-			if (PROG_TO_EDICT(clip->passedict->v->owner) == touch)
-				continue;	// don't clip against owner
-			// LordHavoc: corpse code
-			if (clip->passedict->v->solid == SOLID_CORPSE && (touch->v->solid == SOLID_SLIDEBOX || touch->v->solid == SOLID_CORPSE))
-				continue;
-			if (clip->passedict->v->solid == SOLID_SLIDEBOX && touch->v->solid == SOLID_CORPSE)
-				continue;
+			Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", PRVM_NUM_FOR_EDICT(ent));
+			return trace;
 		}
 
-		// might interact, so do an exact clip
-		if (touch->v->solid == SOLID_BSP)
-			trace = SV_ClipMoveToEntity (touch, clip->start, clip->hullmins, clip->hullmaxs, clip->end);
-		else if ((int)touch->v->flags & FL_MONSTER)
-			trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins2, clip->maxs2, clip->end);
-		else
-			trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins, clip->maxs, clip->end);
-		// LordHavoc: take the 'best' answers from the new trace and combine with existing data
-		if (trace.allsolid)
-			clip->trace.allsolid = true;
-		if (trace.startsolid)
-		{
-			clip->trace.startsolid = true;
-			if (!clip->trace.ent)
-				clip->trace.ent = trace.ent;
-		}
-		if (trace.inopen)
-			clip->trace.inopen = true;
-		if (trace.inwater)
-			clip->trace.inwater = true;
-		if (trace.fraction < clip->trace.fraction)
+		if ((int) ent->fields.server->solid == SOLID_BSP)
 		{
-			clip->trace.fraction = trace.fraction;
-			VectorCopy(trace.endpos, clip->trace.endpos);
-			clip->trace.plane = trace.plane;
-			clip->trace.endcontents = trace.endcontents;
-			clip->trace.ent = trace.ent;
+			if (!model->TraceBox)
+			{
+				Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with a non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
+				return trace;
+			}
+			//if ((int) ent->fields.server->movetype != MOVETYPE_PUSH)
+			//{
+			//	Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP without MOVETYPE_PUSH\n", PRVM_NUM_FOR_EDICT(ent));
+			//	return trace;
+			//}
 		}
+		Matrix4x4_CreateFromQuakeEntity(&matrix, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2], ent->fields.server->angles[0], ent->fields.server->angles[1], ent->fields.server->angles[2], 1);
 	}
+	else
+		Matrix4x4_CreateTranslate(&matrix, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2]);
 
-// recurse down both sides
-	if (node->axis == -1)
-		return;
+	Matrix4x4_Invert_Simple(&imatrix, &matrix);
+	Matrix4x4_Transform(&imatrix, start, starttransformed);
+	Matrix4x4_Transform(&imatrix, end, endtransformed);
+#if COLLISIONPARANOID >= 3
+	Con_Printf("trans(%f %f %f -> %f %f %f, %f %f %f -> %f %f %f)", start[0], start[1], start[2], starttransformed[0], starttransformed[1], starttransformed[2], end[0], end[1], end[2], endtransformed[0], endtransformed[1], endtransformed[2]);
+#endif
 
-	if (clip->boxmaxs[node->axis] > node->dist)
+	if (model && model->TraceBox)
 	{
-		if (clip->boxmins[node->axis] < node->dist)
-			SV_ClipToAreaNodes(node->children[1], clip);
-		node = node->children[0];
-		goto loc0;
+		int frame;
+		frame = (int)ent->fields.server->frame;
+		frame = bound(0, frame, (model->numframes - 1));
+		VectorAdd(starttransformed, maxs, starttransformedmaxs);
+		VectorAdd(endtransformed, maxs, endtransformedmaxs);
+		VectorAdd(starttransformed, mins, starttransformedmins);
+		VectorAdd(endtransformed, mins, endtransformedmins);
+		model->TraceBox(model, frame, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, hitsupercontents);
 	}
-	else if (clip->boxmins[node->axis] < node->dist)
+	else
+		Collision_ClipTrace_Box(&trace, ent->fields.server->mins, ent->fields.server->maxs, starttransformed, mins, maxs, endtransformed, hitsupercontents, SUPERCONTENTS_SOLID);
+	trace.fraction = bound(0, trace.fraction, 1);
+	trace.realfraction = bound(0, trace.realfraction, 1);
+
+	if (trace.fraction < 1)
 	{
-		node = node->children[1];
-		goto loc0;
+		VectorLerp(start, trace.fraction, end, trace.endpos);
+		VectorCopy(trace.plane.normal, tempnormal);
+		Matrix4x4_Transform3x3(&matrix, tempnormal, trace.plane.normal);
+		// FIXME: should recalc trace.plane.dist
 	}
+	else
+		VectorCopy(end, trace.endpos);
+
+	return trace;
 }
 
 /*
-====================
-SV_ClipToAreaGrid
-
-Mins and maxs enclose the entire area swept by the move
-====================
+==================
+SV_ClipMoveToWorld
+==================
 */
-void SV_ClipToAreaGrid(moveclip_t *clip)
+trace_t SV_ClipMoveToWorld(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents)
 {
-	link_t *l, *next;
-	edict_t *touch;
-	areagrid_t *grid;
-	int igrid[3], igridmins[3], igridmaxs[3];
 	trace_t trace;
-
-	if (clip->trace.allsolid)
-		return;
-
-	igridmins[0] = (int) ((clip->boxmins[0] + sv_areagridbias[0]) * sv_areagridscale[0]);
-	igridmins[1] = (int) ((clip->boxmins[1] + sv_areagridbias[1]) * sv_areagridscale[1]);
-	//igridmins[2] = (int) ((clip->boxmins[2] + sv_areagridbias[2]) * sv_areagridscale[2]);
-	igridmaxs[0] = (int) ((clip->boxmaxs[0] + sv_areagridbias[0]) * sv_areagridscale[0]) + 1;
-	igridmaxs[1] = (int) ((clip->boxmaxs[1] + sv_areagridbias[1]) * sv_areagridscale[1]) + 1;
-	//igridmaxs[2] = (int) ((clip->boxmaxs[2] + sv_areagridbias[2]) * sv_areagridscale[2]) + 1;
-	igridmins[0] = max(0, igridmins[0]);
-	igridmins[1] = max(0, igridmins[1]);
-	//igridmins[2] = max(0, igridmins[2]);
-	igridmaxs[0] = min(AREA_GRID, igridmaxs[0]);
-	igridmaxs[1] = min(AREA_GRID, igridmaxs[1]);
-	//igridmaxs[2] = min(AREA_GRID, igridmaxs[2]);
-
-	for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
-	{
-		grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0];
-		for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
-		{
-			for (l = grid->solid_edicts.next;l != &grid->solid_edicts;l = next)
-			{
-				next = l->next;
-				touch = EDICT_FROM_AREA(l);
-				if (touch->v->solid == SOLID_NOT)
-					continue;
-				if (touch == clip->passedict)
-					continue;
-				if (touch->v->solid == SOLID_TRIGGER)
-				{
-					ED_Print(touch);
-					Host_Error ("Trigger in clipping list");
-				}
-
-				if (clip->type == MOVE_NOMONSTERS && touch->v->solid != SOLID_BSP)
-					continue;
-
-				if (clip->boxmins[0] > touch->v->absmax[0]
-				 || clip->boxmaxs[0] < touch->v->absmin[0]
-				 || clip->boxmins[1] > touch->v->absmax[1]
-				 || clip->boxmaxs[1] < touch->v->absmin[1]
-				 || clip->boxmins[2] > touch->v->absmax[2]
-				 || clip->boxmaxs[2] < touch->v->absmin[2])
-					continue;
-
-				if (clip->passedict)
-				{
-					if (clip->passedict->v->size[0] && !touch->v->size[0])
-						continue;	// points never interact
-					if (PROG_TO_EDICT(touch->v->owner) == clip->passedict)
-						continue;	// don't clip against own missiles
-					if (PROG_TO_EDICT(clip->passedict->v->owner) == touch)
-						continue;	// don't clip against owner
-					// LordHavoc: corpse code
-					if (clip->passedict->v->solid == SOLID_CORPSE && (touch->v->solid == SOLID_SLIDEBOX || touch->v->solid == SOLID_CORPSE))
-						continue;
-					if (clip->passedict->v->solid == SOLID_SLIDEBOX && touch->v->solid == SOLID_CORPSE)
-						continue;
-				}
-
-				// might interact, so do an exact clip
-				if (touch->v->solid == SOLID_BSP)
-					trace = SV_ClipMoveToEntity (touch, clip->start, clip->hullmins, clip->hullmaxs, clip->end);
-				else if ((int)touch->v->flags & FL_MONSTER)
-					trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins2, clip->maxs2, clip->end);
-				else
-					trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins, clip->maxs, clip->end);
-				// LordHavoc: take the 'best' answers from the new trace and combine with existing data
-				if (trace.allsolid)
-					clip->trace.allsolid = true;
-				if (trace.startsolid)
-				{
-					clip->trace.startsolid = true;
-					if (!clip->trace.ent)
-						clip->trace.ent = trace.ent;
-				}
-				if (trace.inopen)
-					clip->trace.inopen = true;
-				if (trace.inwater)
-					clip->trace.inwater = true;
-				if (trace.fraction < clip->trace.fraction)
-				{
-					clip->trace.fraction = trace.fraction;
-					VectorCopy(trace.endpos, clip->trace.endpos);
-					clip->trace.plane = trace.plane;
-					clip->trace.endcontents = trace.endcontents;
-					clip->trace.ent = trace.ent;
-				}
-				if (clip->trace.allsolid)
-					return;
-			}
-		}
-	}
+	float starttransformedmins[3], starttransformedmaxs[3], endtransformedmins[3], endtransformedmaxs[3];
+	memset(&trace, 0, sizeof(trace));
+	trace.fraction = trace.realfraction = 1;
+	VectorAdd(start, maxs, starttransformedmaxs);
+	VectorAdd(end, maxs, endtransformedmaxs);
+	VectorAdd(start, mins, starttransformedmins);
+	VectorAdd(end, mins, endtransformedmins);
+	sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, hitsupercontents);
+	trace.fraction = bound(0, trace.fraction, 1);
+	trace.realfraction = bound(0, trace.realfraction, 1);
+	VectorLerp(start, trace.fraction, end, trace.endpos);
+	return trace;
 }
 
+//===========================================================================
 
 /*
 ==================
-SV_MoveBounds
+SV_Move
 ==================
 */
-void SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, vec3_t boxmins, vec3_t boxmaxs)
+#if COLLISIONPARANOID >= 1
+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)
+#else
+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)
+#endif
 {
-	if (sv_useareanodes.integer)
+	vec3_t hullmins, hullmaxs;
+	int i;
+	int hitsupercontentsmask;
+	int passedictprog;
+	qboolean pointtrace;
+	prvm_edict_t *traceowner, *touch;
+	trace_t trace;
+	// bounding box of entire move area
+	vec3_t clipboxmins, clipboxmaxs;
+	// size of the moving object
+	vec3_t clipmins, clipmaxs;
+	// size when clipping against monsters
+	vec3_t clipmins2, clipmaxs2;
+	// start and end origin of move
+	vec3_t clipstart, clipend;
+	// trace results
+	trace_t cliptrace;
+	int numtouchedicts;
+	prvm_edict_t *touchedicts[MAX_EDICTS];
+
+	VectorCopy(start, clipstart);
+	VectorCopy(end, clipend);
+	VectorCopy(mins, clipmins);
+	VectorCopy(maxs, clipmaxs);
+	VectorCopy(mins, clipmins2);
+	VectorCopy(maxs, clipmaxs2);
+#if COLLISIONPARANOID >= 3
+	Con_Printf("move(%f %f %f,%f %f %f)", clipstart[0], clipstart[1], clipstart[2], clipend[0], clipend[1], clipend[2]);
+#endif
+
+	hitsupercontentsmask = SUPERCONTENTS_SOLID;
+	if (passedict)
 	{
-		int i;
+		if (passedict->fields.server->solid == SOLID_SLIDEBOX)
+			hitsupercontentsmask |= SUPERCONTENTS_PLAYERCLIP;
+		if ((int)passedict->fields.server->flags & FL_MONSTER)
+			hitsupercontentsmask |= SUPERCONTENTS_MONSTERCLIP;
+	}
+
+	// clip to world
+	cliptrace = SV_ClipMoveToWorld(clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
+	if (cliptrace.startsolid || cliptrace.fraction < 1)
+		cliptrace.ent = prog->edicts;
+	if (type == MOVE_WORLDONLY)
+		return cliptrace;
 
-		for (i=0 ; i<3 ; i++)
+	if (type == MOVE_MISSILE)
+	{
+		// LordHavoc: modified this, was = -15, now -= 15
+		for (i = 0;i < 3;i++)
 		{
-			if (end[i] > start[i])
-			{
-				boxmins[i] = start[i] + mins[i] - 1;
-				boxmaxs[i] = end[i] + maxs[i] + 1;
-			}
-			else
-			{
-				boxmins[i] = end[i] + mins[i] - 1;
-				boxmaxs[i] = start[i] + maxs[i] + 1;
-			}
+			clipmins2[i] -= 15;
+			clipmaxs2[i] += 15;
 		}
 	}
+
+	// get adjusted box for bmodel collisions if the world is q1bsp or hlbsp
+	if (sv.worldmodel && sv.worldmodel->brush.RoundUpToHullSize)
+		sv.worldmodel->brush.RoundUpToHullSize(sv.worldmodel, clipmins, clipmaxs, hullmins, hullmaxs);
 	else
 	{
-		// debug to test against everything
-		boxmins[0] = boxmins[1] = boxmins[2] = -999999999;
-		boxmaxs[0] = boxmaxs[1] = boxmaxs[2] =  999999999;
+		VectorCopy(clipmins, hullmins);
+		VectorCopy(clipmaxs, hullmaxs);
 	}
-}
 
-/*
-==================
-SV_Move
-==================
-*/
-trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict)
-{
-	moveclip_t	clip;
-	vec3_t		bigmins, bigmaxs;
-	int			i;
-
-	memset ( &clip, 0, sizeof ( moveclip_t ) );
-
-	VectorCopy(start, clip.start);
-	VectorCopy(end, clip.end);
-	VectorCopy(mins, clip.mins);
-	VectorCopy(maxs, clip.maxs);
-	clip.type = type;
-	clip.passedict = passedict;
-
-	Collision_RoundUpToHullSize(sv.worldmodel, clip.mins, clip.maxs, clip.hullmins, clip.hullmaxs);
+	// create the bounding box of the entire move
+	for (i = 0;i < 3;i++)
+	{
+		clipboxmins[i] = min(clipstart[i], cliptrace.endpos[i]) + min(hullmins[i], clipmins2[i]) - 1;
+		clipboxmaxs[i] = max(clipstart[i], cliptrace.endpos[i]) + max(hullmaxs[i], clipmaxs2[i]) + 1;
+	}
 
-	if (type == MOVE_MISSILE)
+	// debug override to test against everything
+	if (sv_debugmove.integer)
 	{
-		// LordHavoc: modified this, was = -15, now = clip.mins[i] - 15
-		for (i=0 ; i<3 ; i++)
-		{
-			clip.mins2[i] = clip.mins[i] - 15;
-			clip.maxs2[i] = clip.maxs[i] + 15;
-		}
+		clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
+		clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
 	}
-	else
+
+	// if the passedict is world, make it NULL (to avoid two checks each time)
+	if (passedict == prog->edicts)
+		passedict = NULL;
+	// precalculate prog value for passedict for comparisons
+	passedictprog = PRVM_EDICT_TO_PROG(passedict);
+	// figure out whether this is a point trace for comparisons
+	pointtrace = VectorCompare(clipmins, clipmaxs);
+	// precalculate passedict's owner edict pointer for comparisons
+	traceowner = passedict ? PRVM_PROG_TO_EDICT(passedict->fields.server->owner) : 0;
+
+	// clip to enttiies
+	numtouchedicts = SV_EntitiesInBox(clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts);
+	if (numtouchedicts > MAX_EDICTS)
 	{
-		VectorCopy (clip.mins, clip.mins2);
-		VectorCopy (clip.maxs, clip.maxs2);
+		// this never happens
+		Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+		numtouchedicts = MAX_EDICTS;
 	}
+	for (i = 0;i < numtouchedicts;i++)
+	{
+		touch = touchedicts[i];
 
-	bigmins[0] = min(clip.mins2[0], clip.hullmins[0]);
-	bigmaxs[0] = max(clip.maxs2[0], clip.hullmaxs[0]);
-	bigmins[1] = min(clip.mins2[1], clip.hullmins[1]);
-	bigmaxs[1] = max(clip.maxs2[1], clip.hullmaxs[1]);
-	bigmins[2] = min(clip.mins2[2], clip.hullmins[2]);
-	bigmaxs[2] = max(clip.maxs2[2], clip.hullmaxs[2]);
+		if (touch->fields.server->solid < SOLID_BBOX)
+			continue;
+		if (type == MOVE_NOMONSTERS && touch->fields.server->solid != SOLID_BSP)
+			continue;
 
-	// clip to world
-	clip.trace = SV_ClipMoveToEntity (sv.edicts, start, mins, maxs, end);
+		if (passedict)
+		{
+			// don't clip against self
+			if (passedict == touch)
+				continue;
+			// don't clip owned entities against owner
+			if (traceowner == touch)
+				continue;
+			// don't clip owner against owned entities
+			if (passedictprog == touch->fields.server->owner)
+				continue;
+			// don't clip points against points (they can't collide)
+			if (pointtrace && VectorCompare(touch->fields.server->mins, touch->fields.server->maxs) && (type != MOVE_MISSILE || !((int)touch->fields.server->flags & FL_MONSTER)))
+				continue;
+			// don't clip corpse against character
+			if (passedict->fields.server->solid == SOLID_CORPSE && (touch->fields.server->solid == SOLID_SLIDEBOX || touch->fields.server->solid == SOLID_CORPSE))
+				continue;
+			// don't clip character against corpse
+			if (passedict->fields.server->solid == SOLID_SLIDEBOX && touch->fields.server->solid == SOLID_CORPSE)
+				continue;
+		}
 
-	// clip to entities
-	// create the bounding box of the entire move
-	SV_MoveBounds ( start, bigmins, bigmaxs, end, clip.boxmins, clip.boxmaxs );
+		// might interact, so do an exact clip
+		if ((int)touch->fields.server->flags & FL_MONSTER)
+			trace = SV_ClipMoveToEntity(touch, clipstart, clipmins2, clipmaxs2, clipend, type, hitsupercontentsmask);
+		else
+			trace = SV_ClipMoveToEntity(touch, clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
+		// LordHavoc: take the 'best' answers from the new trace and combine with existing data
+		if (trace.allsolid)
+			cliptrace.allsolid = true;
+		if (trace.startsolid)
+		{
+			cliptrace.startsolid = true;
+			if (cliptrace.realfraction == 1)
+				cliptrace.ent = touch;
+		}
+		// don't set this except on the world, because it can easily confuse
+		// monsters underwater if there's a bmodel involved in the trace
+		// (inopen && inwater is how they check water visibility)
+		//if (trace.inopen)
+		//	cliptrace.inopen = true;
+		if (trace.inwater)
+			cliptrace.inwater = true;
+		if (trace.realfraction < cliptrace.realfraction)
+		{
+			cliptrace.fraction = trace.fraction;
+			cliptrace.realfraction = trace.realfraction;
+			VectorCopy(trace.endpos, cliptrace.endpos);
+			cliptrace.plane = trace.plane;
+			cliptrace.ent = touch;
+		}
+		cliptrace.startsupercontents |= trace.startsupercontents;
+	}
 
-	SV_ClipToAreaNodes(sv_areanodes, &clip);
-	SV_ClipToAreaGrid(&clip);
+	return cliptrace;
+}
 
-	return clip.trace;
+#if COLLISIONPARANOID >= 1
+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 endstuck;
+	trace_t trace;
+	vec3_t temp;
+	trace = SV_Move_(start, mins, maxs, end, type, passedict);
+	if (passedict)
+	{
+		VectorCopy(trace.endpos, temp);
+		endstuck = SV_Move_(temp, mins, maxs, temp, type, passedict).startsolid;
+#if COLLISIONPARANOID < 3
+		if (trace.startsolid || endstuck)
+#endif
+			Con_Printf("%s{e%i:%f %f %f:%f %f %f:%f:%f %f %f%s%s}\n", (trace.startsolid || endstuck) ? "\002" : "", passedict ? passedict - prog->edicts : -1, passedict->fields.server->origin[0], passedict->fields.server->origin[1], passedict->fields.server->origin[2], end[0] - passedict->fields.server->origin[0], end[1] - passedict->fields.server->origin[1], end[2] - passedict->fields.server->origin[2], trace.fraction, trace.endpos[0] - passedict->fields.server->origin[0], trace.endpos[1] - passedict->fields.server->origin[1], trace.endpos[2] - passedict->fields.server->origin[2], trace.startsolid ? " startstuck" : "", endstuck ? " endstuck" : "");
+	}
+	return trace;
 }
+#endif
+