From 682da4b29f1a896e13e247acaaee47903b95a3a7 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 19 Jun 2016 01:15:54 +1000 Subject: [PATCH 1/1] Only hide the flag from the player if the player can carry the flag into the vehicle --- qcsrc/server/mutators/mutator/gamemode_ctf.qc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc index f9872e749..a184e68df 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc +++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc @@ -2238,14 +2238,13 @@ MUTATOR_HOOKFUNCTION(ctf, VehicleEnter) if(player.flagcarried) { - player.flagcarried.nodrawtoclient = player; // hide the flag from the driver - if(!autocvar_g_ctf_allow_vehicle_carry && !autocvar_g_ctf_allow_vehicle_touch) { ctf_Handle_Throw(player, NULL, DROP_NORMAL); } else { + player.flagcarried.nodrawtoclient = player; // hide the flag from the driver setattachment(player.flagcarried, veh, ""); setorigin(player.flagcarried, VEHICLE_FLAG_OFFSET); player.flagcarried.scale = VEHICLE_FLAG_SCALE; -- 2.39.2