From 1573eb8b911c787aefd999f84c973b3fb3b4ede2 Mon Sep 17 00:00:00 2001 From: driAn Date: Mon, 21 Apr 2008 18:44:40 +0000 Subject: [PATCH] special pickup code for ctf-flags git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1820 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 21347bf0..7c98d275 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -124,7 +124,7 @@ void trypickup(int n, playerent *d) flaginfo &of = flaginfos[team_opposite(flag)]; if(f.state == CTFF_STOLEN) break; - if(flag == team_int(d->team)) // its the own flag + if(flag == team_int(d->team)) // it's the own flag { if(f.state == CTFF_DROPPED) flagreturn(); else if(f.state == CTFF_INBASE && of.state == CTFF_STOLEN && of.actor == d && of.ack) flagscore(); @@ -157,7 +157,7 @@ void checkitems(playerent *d) if(!e.spawned) continue; if(OUTBORD(e.x, e.y)) continue; - vec v(e.x, e.y, S(e.x, e.y)->floor+eyeheight); + vec v(e.x, e.y, e.type == CTF_FLAG ? e.z : S(e.x, e.y)->floor+eyeheight); if(d->o.dist(v)<2.5f) trypickup(i, d); } }