From: Samual <samual@xonotic.org>
Date: Mon, 2 Apr 2012 06:50:22 +0000 (-0400)
Subject: Actually, re-re-think that even more
X-Git-Tag: xonotic-v0.7.0~240^2~100
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=bb1c51447c3620b193974956bc39f3f532d21ce9;p=xonotic%2Fxonotic-data.pk3dir.git

Actually, re-re-think that even more
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 0c3ccc841..321bf342e 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -984,10 +984,10 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey)
 {
 	entity player = self;
 
-	if(time > player.throw_antispam)
+	if((time > player.throw_antispam) && !player.speedrunning && !player.vehicle)
 	{
 		// pass the flag to a team mate
-		if(autocvar_g_ctf_pass && !player.speedrunning && !player.vehicle)
+		if(autocvar_g_ctf_pass)
 		{
 			entity head, closest_target;
 			head = findradius(player.origin, autocvar_g_ctf_pass_radius);
@@ -1030,7 +1030,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey)
 		}
 		
 		// throw the flag in front of you
-		if(autocvar_g_ctf_drop && player.flagcarried && !player.speedrunning)
+		if(autocvar_g_ctf_drop && player.flagcarried)
 			{ ctf_Handle_Throw(player, world, DROP_THROW); }
 	}