From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 5 May 2013 04:04:34 +0000 (+0000)
Subject: VM_CL_findradius now uses World_EntitiesInBox as it should
X-Git-Tag: xonotic-v0.8.0~96^2~94
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=770b47df3531baa6b270871b7a0174ccfabacd31;p=xonotic%2Fdarkplaces.git

VM_CL_findradius now uses World_EntitiesInBox as it should


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11946 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 04d03a9b..6ca2749c 100644
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -455,22 +455,6 @@ static void VM_CL_precache_model (prvm_prog_t *prog)
 	VM_Warning(prog, "VM_CL_precache_model: model \"%s\" not found\n", name);
 }
 
-static int CSQC_EntitiesInBox (prvm_prog_t *prog, vec3_t mins, vec3_t maxs, int maxlist, prvm_edict_t **list)
-{
-	prvm_edict_t	*ent;
-	int				i, k;
-
-	ent = PRVM_NEXT_EDICT(prog->edicts);
-	for(k=0,i=1; i<prog->num_edicts ;i++, ent = PRVM_NEXT_EDICT(ent))
-	{
-		if (ent->priv.required->free)
-			continue;
-		if(BoxesOverlap(mins, maxs, PRVM_clientedictvector(ent, absmin), PRVM_clientedictvector(ent, absmax)))
-			list[k++] = ent;
-	}
-	return k;
-}
-
 // #22 entity(vector org, float rad) findradius
 static void VM_CL_findradius (prvm_prog_t *prog)
 {
@@ -502,7 +486,7 @@ static void VM_CL_findradius (prvm_prog_t *prog)
 	maxs[0] = org[0] + (radius + 1);
 	maxs[1] = org[1] + (radius + 1);
 	maxs[2] = org[2] + (radius + 1);
-	numtouchedicts = CSQC_EntitiesInBox(prog, mins, maxs, MAX_EDICTS, touchedicts);
+	numtouchedicts = World_EntitiesInBox(&cl.world, mins, maxs, MAX_EDICTS, touchedicts);
 	if (numtouchedicts > MAX_EDICTS)
 	{
 		// this never happens	//[515]: for what then ?