From: Samual <samual@xonotic.org>
Date: Sun, 1 Apr 2012 17:13:17 +0000 (-0400)
Subject: Fix flag throwing bug and dropped capture bug
X-Git-Tag: xonotic-v0.7.0~240^2~119
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a729b288a22181d391bc0820ecfb0c60b7a2ca8f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix flag throwing bug and dropped capture bug
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 4c261d09d..5e6818806 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -263,6 +263,8 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype)
 	flag.solid = SOLID_TRIGGER;
 	flag.ctf_droptime = time;
 	
+	flag.flags = FL_ITEM | FL_NOTARGET; // clear FL_ONGROUND for MOVETYPE_TOSS
+	
 	switch(droptype)
 	{
 		case DROP_PASS:
@@ -287,8 +289,6 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype)
 		}
 	}
 	
-	print("flag.velocity = ", vtos(flag.velocity), ".\n");
-	
 	switch(droptype)
 	{
 		case DROP_PASS:
@@ -367,7 +367,7 @@ void ctf_Handle_Capture(entity flag, entity toucher, float capturetype)
 	
 	// reset the flag
 	player.next_take_time = time + autocvar_g_ctf_flag_collect_delay;
-	ctf_RespawnFlag(player.flagcarried);
+	ctf_RespawnFlag(enemy_flag);
 }
 
 void ctf_Handle_Return(entity flag, entity player)