From 72817fae437d6e25600c73bc9c00778717a6bd12 Mon Sep 17 00:00:00 2001
From: Mario <zacjardine@y7mail.com>
Date: Fri, 5 Dec 2014 21:48:49 +1100
Subject: [PATCH] Fix flags passing through clips and becoming unreachable,
 partially fix picking up flags while driving a vehicle, fix stalemate message
 not disappearing sometimes, fix console warning when non-player entity
 touches a shielded flag, fix passing flags to teammates already carrying
 flags deleting the carrier's first flag

---
 qcsrc/server/mutators/gamemode_ctf.qc | 39 ++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 967d8d656f..4e051d1972 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -176,7 +176,7 @@ void ctf_CaptureShield_Touch()
 	vector othermid = (other.absmin + other.absmax) * 0.5;
 
 	Damage(other, self, self, 0, DEATH_HURTTRIGGER, mymid, normalize(othermid - mymid) * ctf_captureshield_force);
-	Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_CTF_CAPTURESHIELD_SHIELDED);
+	if(IS_REAL_CLIENT(other)) { Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_CTF_CAPTURESHIELD_SHIELDED); }
 }
 
 void ctf_CaptureShield_Spawn(entity flag)
@@ -257,8 +257,17 @@ void ctf_Handle_Retrieve(entity flag, entity player)
 	flag.owner.flagcarried = flag;
 
 	// reset flag
-	setattachment(flag, player, "");
-	setorigin(flag, FLAG_CARRY_OFFSET);
+	if(player.vehicle)
+	{
+		setattachment(flag, player.vehicle, "");
+		setorigin(flag, VEHICLE_FLAG_OFFSET);
+		flag.scale = VEHICLE_FLAG_SCALE;
+	}
+	else
+	{
+		setattachment(flag, player, "");
+		setorigin(flag, FLAG_CARRY_OFFSET);
+	}
 	flag.movetype = MOVETYPE_NONE;
 	flag.takedamage = DAMAGE_NO;
 	flag.solid = SOLID_NOT;
@@ -475,8 +484,17 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype)
 	// attach the flag to the player
 	flag.owner = player;
 	player.flagcarried = flag;
-	setattachment(flag, player, "");
-	setorigin(flag, FLAG_CARRY_OFFSET);
+	if(player.vehicle)
+	{
+		setattachment(flag, player.vehicle, "");
+		setorigin(flag, VEHICLE_FLAG_OFFSET);
+		flag.scale = VEHICLE_FLAG_SCALE;
+	}
+	else
+	{
+		setattachment(flag, player, "");
+		setorigin(flag, FLAG_CARRY_OFFSET);
+	}
 
 	// flag setup
 	flag.movetype = MOVETYPE_NONE;
@@ -757,6 +775,7 @@ void ctf_FlagThink()
 
 			if((self.pass_target == world)
 				|| (self.pass_target.deadflag != DEAD_NO)
+				|| (self.pass_target.flagcarried)
 				|| (vlen(self.origin - targ_origin) > autocvar_g_ctf_pass_radius)
 				|| ((trace_fraction < 1) && (trace_ent != self.pass_target))
 				|| (time > self.ctf_droptime + autocvar_g_ctf_pass_timelimit))
@@ -783,6 +802,7 @@ void ctf_FlagThink()
 void ctf_FlagTouch()
 {
 	if(gameover) { return; }
+	if(trace_dphitcontents & (DPCONTENTS_PLAYERCLIP | DPCONTENTS_MONSTERCLIP)) { return; }
 
 	entity toucher = other;
 	float is_not_monster = (!(toucher.flags & FL_MONSTER));
@@ -884,6 +904,9 @@ void ctf_RespawnFlag(entity flag)
 			ctf_FakeTimeLimit(flag.owner, -1);
 	}
 
+	if((flag.owner) && (flag.owner.vehicle))
+		flag.scale = FLAG_SCALE;
+
 	if((flag.ctf_status == FLAG_DROPPED) && (flag.wps_flagdropped))
 		{ WaypointSprite_Kill(flag.wps_flagdropped); }
 
@@ -907,6 +930,8 @@ void ctf_RespawnFlag(entity flag)
 	flag.ctf_dropper = world;
 	flag.ctf_pickuptime = 0;
 	flag.ctf_droptime = 0;
+
+	ctf_CheckStalemate();
 }
 
 void ctf_Reset()
@@ -1264,7 +1289,7 @@ void havocbot_ctf_reset_role(entity bot)
 	// if there is only me on the team switch to offense
 	c = 0;
 	FOR_EACH_PLAYER(head)
-	if(head.team==bot.team)
+	if(SAME_TEAM(head, bot))
 		++c;
 
 	if(c==1)
@@ -1630,7 +1655,7 @@ void havocbot_role_ctf_defense()
 		}
 
 		if(closestplayer)
-		if(closestplayer.team!=self.team)
+		if(DIFF_TEAM(closestplayer, self))
 		if(vlen(org - self.origin)>1000)
 		if(checkpvs(self.origin,closestplayer)||random()<0.5)
 			havocbot_goalrating_ctf_ourbase(30000);
-- 
2.39.2