sort scores in team modes too
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1845 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
@@ -159,12 +159,12 @@ void checkitems(playerent *d)
|
||||
if(!e.spawned) continue;
|
||||
if(OUTBORD(e.x, e.y)) continue;
|
||||
|
||||
if(e.type==CTF_FLAG)
|
||||
if(e.type==CTF_FLAG) // 3d collision for ctf flags
|
||||
{
|
||||
vec v(e.x, e.y, e.z);
|
||||
if(objcollide(d, v, 2.5f, 4.0f)) trypickup(i, d);
|
||||
}
|
||||
else
|
||||
else // simple 2d collision
|
||||
{
|
||||
vec v(e.x, e.y, S(e.x, e.y)->floor+eyeheight);
|
||||
if(d->o.dist(v)<2.5f) trypickup(i, d);
|
||||
|
||||
Reference in New Issue
Block a user