From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 16 Mar 2002 14:45:18 +0000 (+0000)
Subject: Check bbox for overlap even on bmodels again (disabling it was a speed loss)
X-Git-Tag: RELEASE_0_2_0_RC1~572
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=1a194dda7517814164b09e7696eab559c4df439f

Check bbox for overlap even on bmodels again (disabling it was a speed loss)


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

diff --git a/world.c b/world.c
index 60c00c09..d8d092ff 100644
--- a/world.c
+++ b/world.c
@@ -841,14 +841,12 @@ loc0:
 		if (clip->type == MOVE_NOMONSTERS && touch->v.solid != SOLID_BSP)
 			continue;
 
-		// LordHavoc: only do bbox check if it is a bbox entity
-		if (touch->v.solid != SOLID_BSP
-		 && (clip->boxmins[0] > touch->v.absmax[0]
+		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]))
+		 || clip->boxmaxs[2] < touch->v.absmin[2])
 			continue;
 
 		if (clip->passedict)