]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Actually, re-think that a little bit
authorSamual <samual@xonotic.org>
Mon, 2 Apr 2012 06:48:39 +0000 (02:48 -0400)
committerSamual <samual@xonotic.org>
Mon, 2 Apr 2012 06:48:39 +0000 (02:48 -0400)
qcsrc/server/mutators/gamemode_ctf.qc

index 6d4dab29f2416357b821d3d360b6948de2901134..0c3ccc84145221b58185e8bde8145d54d9c670f6 100644 (file)
@@ -987,7 +987,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey)
        if(time > player.throw_antispam)
        {
                // pass the flag to a team mate
-               if(autocvar_g_ctf_pass)
+               if(autocvar_g_ctf_pass && !player.speedrunning && !player.vehicle)
                {
                        entity head, closest_target;
                        head = findradius(player.origin, autocvar_g_ctf_pass_radius);
@@ -996,8 +996,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey)
                        {
                                if(head.classname == "player" && head.deadflag == DEAD_NO)
                                if(head != player && !IsDifferentTeam(head, player))
-                               if(!player.speedrunning && !head.speedrunning)
-                               if(!player.vehicle && !head.vehicle)
+                               if(!head.speedrunning && !head.vehicle)
                                {
                                        traceline(player.origin, head.origin, MOVE_NOMONSTERS, player);
                                        if not((trace_fraction < 1) && (trace_ent != head))