]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix passing of flag notification on the HUD -- this should be secret ^_^
authorSamual Lenks <samual@xonotic.org>
Thu, 6 Sep 2012 03:27:31 +0000 (23:27 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 6 Sep 2012 03:27:31 +0000 (23:27 -0400)
qcsrc/server/mutators/gamemode_ctf.qc

index a12b769f1ad6e0d1cee4fd85a11061c0baf5ab65..b57227625cb014cec63035687010eedc65cab62b 100644 (file)
@@ -1004,9 +1004,10 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerPreThink)
        {
                switch(flag.ctf_status)
                {
+                       case FLAG_PASSING:
                        case FLAG_CARRY:
                        {
-                               if(flag.owner == self)
+                               if((flag.owner == self) || (flag.pass_sender == self))
                                        self.items |= ((flag.items & IT_KEY2) ? IT_RED_FLAG_CARRYING : IT_BLUE_FLAG_CARRYING); // carrying: self is currently carrying the flag
                                else 
                                        self.items |= ((flag.items & IT_KEY2) ? IT_RED_FLAG_TAKEN : IT_BLUE_FLAG_TAKEN); // taken: someone on self's team is carrying the flag