From: Jakob MG Date: Wed, 6 Apr 2011 09:30:26 +0000 (+0200) Subject: Set FL_NOTARGET on ctf flags (avoids turrets and otehr AI shooting them X-Git-Tag: xonotic-v0.5.0~307^2~4^2~1^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d92f62094b7f22f7b20762e2db24b8ac2ace56ac;p=xonotic%2Fxonotic-data.pk3dir.git Set FL_NOTARGET on ctf flags (avoids turrets and otehr AI shooting them --- diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc index b31e14293..cf16cecff 100644 --- a/qcsrc/server/ctf.qc +++ b/qcsrc/server/ctf.qc @@ -173,7 +173,7 @@ void place_flag() setattachment(self, world, ""); self.mdl = self.model; - self.flags = FL_ITEM; + self.flags = FL_ITEM | FL_NOTARGET; self.solid = SOLID_TRIGGER; self.movetype = MOVETYPE_NONE; self.velocity = '0 0 0'; @@ -234,7 +234,7 @@ void RegenFlag(entity e) e.angles = e.mangle; e.cnt = FLAG_BASE; e.owner = world; - e.flags = FL_ITEM; // clear FL_ONGROUND and any other junk + e.flags = FL_ITEM | FL_NOTARGET; // clear FL_ONGROUND and any other junk }; void ReturnFlag(entity e) @@ -319,7 +319,7 @@ void DropFlag(entity e, entity penalty_receiver, entity attacker) p.flagcarried = world; e.owner = world; - e.flags = FL_ITEM; // clear FL_ONGROUND and any other junk + e.flags = FL_ITEM | FL_NOTARGET; // clear FL_ONGROUND and any other junk e.solid = SOLID_TRIGGER; e.movetype = MOVETYPE_TOSS; // setsize(e, '-16 -16 0', '16 16 74'); @@ -549,7 +549,7 @@ void FlagTouch() if (self.cnt == FLAG_DROPPED) { - self.flags = FL_ITEM; // clear FL_ONGROUND and any other junk + self.flags = FL_ITEM | FL_NOTARGET; // clear FL_ONGROUND and any other junk if (other.team == self.team || (other.team != COLOR_TEAM1 && other.team != COLOR_TEAM2)) { // return flag