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 60c00c09172352f4a4511fdc8df5ea11f84c65cd..d8d092ff3a745e5cfec99cf500a5a5b6237a8e8e 100644 (file)
--- 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)