From: Samual <samual@xonotic.org>
Date: Mon, 2 Apr 2012 15:48:09 +0000 (-0400)
Subject: Make captureshield work properly
X-Git-Tag: xonotic-v0.7.0~240^2~92
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=070ffd760cb4002c7c97c54c3b6fdd487c74f7aa;p=xonotic%2Fxonotic-data.pk3dir.git

Make captureshield work properly
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 96b6f4c6f..8613cecba 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -336,7 +336,7 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype)
 			WaypointSprite_Kill(player.wps_enemyflagcarrier);
 	
 	// captureshield
-	//ctf_CaptureShield_Update(player, 0); // shield only
+	ctf_CaptureShield_Update(player, 0); // shield player from picking up flag
 }
 
 
@@ -403,7 +403,9 @@ void ctf_Handle_Return(entity flag, entity player)
 	{
 		// punish the player who dropped the flag
 		PlayerScore_Add(flag.ctf_dropper, SP_SCORE, -ctf_ReadScore("penalty_returned"));
-		ctf_CaptureShield_Update(flag.ctf_dropper, 0); // shield only
+		
+		// captureshield
+		ctf_CaptureShield_Update(flag.ctf_dropper, 0); // shield player from picking up flag
 		
 		// set next take time
 		flag.ctf_dropper.next_take_time = time + autocvar_g_ctf_flag_collect_delay;