From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 23 Jan 2006 21:14:04 +0000 (+0000)
Subject: fixed SOLID_NOT relink touching triggers bug (which was causing CTF flags to be repea... 
X-Git-Tag: xonotic-v0.1.0preview~4374
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6043d1be8b3d04a06b0f1af55523da04c635028;p=xonotic%2Fdarkplaces.git

fixed SOLID_NOT relink touching triggers bug (which was causing CTF flags to be repeatedly captured in Nexuiz)


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

diff --git a/world.c b/world.c
index 0a9a5861..64b493a8 100644
--- a/world.c
+++ b/world.c
@@ -386,13 +386,10 @@ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
 		ent->fields.server->absmax[2] += 1;
 	}
 
-	//if (ent->fields.server->solid == SOLID_NOT)
-	//	return;
-
 	SV_LinkEdict_AreaGrid(ent);
 
 // if touch_triggers, touch all entities at this node and descend for more
-	if (touch_triggers)
+	if (touch_triggers && ent->fields.server.solid != SOLID_NOT)
 		SV_TouchAreaGrid(ent);
 }