From: Mario <zacjardine@y7mail.com>
Date: Fri, 6 Mar 2015 13:40:02 +0000 (+1100)
Subject: Hide the flag from the carrier's view while they're in a vehicle (fixes flag getting... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=74e404da91526c12a718c61cdd2050245e35db7a;p=xonotic%2Fxonotic-data.pk3dir.git

Hide the flag from the carrier's view while they're in a vehicle (fixes flag getting in way of crosshair in 3rd person vehicle mode)
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 4afec770e..7e9565698 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -2152,6 +2152,8 @@ MUTATOR_HOOKFUNCTION(ctf_VehicleEnter)
 {
 	if(vh_player.flagcarried)
 	{
+		vh_player.flagcarried.nodrawtoclient = vh_player; // hide the flag from the driver
+
 		if(!autocvar_g_ctf_allow_vehicle_carry && !autocvar_g_ctf_allow_vehicle_touch)
 		{
 			ctf_Handle_Throw(vh_player, world, DROP_NORMAL);
@@ -2177,6 +2179,7 @@ MUTATOR_HOOKFUNCTION(ctf_VehicleExit)
 		setorigin(vh_player.flagcarried, FLAG_CARRY_OFFSET);
 		vh_player.flagcarried.scale = FLAG_SCALE;
 		vh_player.flagcarried.angles = '0 0 0';
+		vh_player.flagcarried.nodrawtoclient = world;
 		return true;
 	}