From: Samual Lenks <samual@xonotic.org>
Date: Thu, 6 Sep 2012 03:27:31 +0000 (-0400)
Subject: Fix passing of flag notification on the HUD -- this should be secret ^_^
X-Git-Tag: xonotic-v0.7.0~240^2~48
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3eb2744a73801615e5296ec7dd8e89369037d175;p=xonotic%2Fxonotic-data.pk3dir.git

Fix passing of flag notification on the HUD -- this should be secret ^_^
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index a12b769f1..b57227625 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -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