From 3d8602e66c0652e56c2d0a0a7482aac9eb627b2f Mon Sep 17 00:00:00 2001 From: driAn Date: Sat, 3 May 2008 21:31:12 +0000 Subject: [PATCH] ctf flag pickup git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1851 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/physics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/src/physics.cpp b/source/src/physics.cpp index 13424604..94615cf8 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -124,7 +124,7 @@ bool objcollide(physent *d, vec &objpos, float objrad, float objheight) // colli const float maxdist = max(d->eyeheight+d->aboveeye, objheight); const float dz = d->o.z+(-d->eyeheight+d->aboveeye)/2.0f; const float objz = objpos.z+objheight/2.0f; - return dz-objz <= maxdist || dz-objz >= -maxdist; + return dz-objz <= maxdist && dz-objz >= -maxdist; } return false; }