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

@@ -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;
 }