]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Set the flag's movetype to MOVETYPE_NONE when respawning it (matches initial spawning...
authorMario <mario@smbclan.net>
Sat, 9 Mar 2019 08:34:34 +0000 (18:34 +1000)
committerMario <mario@smbclan.net>
Sat, 9 Mar 2019 08:34:34 +0000 (18:34 +1000)
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc

index 6dd1b1e9020ae9b18ddc39479472e8b371a4b8b9..08bb7be948962f2d5c366cef5eab990f2853473d 100644 (file)
@@ -1162,7 +1162,8 @@ void ctf_RespawnFlag(entity flag)
        setattachment(flag, NULL, "");
        setorigin(flag, flag.ctf_spawnorigin);
 
-       set_movetype(flag, ((flag.noalign) ? MOVETYPE_NONE : MOVETYPE_TOSS));
+       //set_movetype(flag, ((flag.noalign) ? MOVETYPE_NONE : MOVETYPE_TOSS)); // would be desired, except maps that want floating flags have it set to fall!
+       set_movetype(flag, MOVETYPE_NONE); // match the initial setup handling (flag doesn't move when spawned)
        flag.takedamage = DAMAGE_NO;
        SetResourceExplicit(flag, RES_HEALTH, flag.max_flag_health);
        flag.solid = SOLID_TRIGGER;