diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 9adea951..9cdfa213 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -560,7 +560,7 @@ void preparectf(bool cleanonly=false) loopi(2) { flaginfo &f = flaginfos[i]; - f.ack = false; + f.ack = true; f.actor = NULL; f.actor_cn = -1; f.team = i; diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 28585e58..9c04691b 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -201,7 +201,7 @@ void checkitems(playerent *d) { flaginfo &f = flaginfos[i]; entity &e = *f.flagent; - if(!e.spawned || (f.state == CTFF_INBASE && !numflagspawn[i])) continue; + if(!e.spawned || !f.ack || (f.state == CTFF_INBASE && !numflagspawn[i])) continue; if(OUTBORD(e.x, e.y)) continue; if(f.state==CTFF_DROPPED) // 3d collision for dropped ctf flags {