diff --git a/source/src/entities.cpp b/source/src/entities.cpp index b01f774c..89fe488e 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -159,7 +159,7 @@ void checkitems(playerent *d) if(!e.spawned) continue; if(OUTBORD(e.x, e.y)) continue; - if(e.type==CTF_FLAG) // 3d collision for ctf flags + if(e.type==CTF_FLAG && flaginfos[e.attr2].state==CTFF_DROPPED) // 3d collision for dropped ctf flags { vec v(e.x, e.y, e.z); if(objcollide(d, v, 2.5f, 4.0f)) trypickup(i, d); @@ -205,7 +205,6 @@ void selectnextprimary(int num) case GUN_SUBGUN: case GUN_SNIPER: case GUN_ASSAULT: - //player1->nextprimary = num; player1->setnextprimary(num); addmsg(SV_PRIMARYWEAP, "ri", player1->nextprimweap->type); break; diff --git a/source/src/physics.cpp b/source/src/physics.cpp index 94615cf8..c62f5986 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -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)o.y)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;