ctf flag pickup

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1853 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-05-03 22:08:58 +00:00
parent fd1f8fa0d9
commit 757b1b304a
2 changed files with 2 additions and 3 deletions
+1 -1
View File
@@ -121,7 +121,7 @@ bool objcollide(physent *d, vec &objpos, float objrad, float objheight) // colli
const float r = d->radius+objrad;
if(fabs(objpos.x-d->o.x)<r && fabs(objpos.y-d->o.y)<r)
{
const float maxdist = max(d->eyeheight+d->aboveeye, objheight);
const float maxdist = (d->eyeheight+d->aboveeye+objheight)/2.0f;
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;