From: Mario <mario@smbclan.net>
Date: Sat, 9 Mar 2019 08:34:34 +0000 (+1000)
Subject: Set the flag's movetype to MOVETYPE_NONE when respawning it (matches initial spawning... 
X-Git-Tag: xonotic-v0.8.5~1583
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=24b7dadb9b8e296faff4d732202b4ef40cef10fc;p=xonotic%2Fxonotic-data.pk3dir.git

Set the flag's movetype to MOVETYPE_NONE when respawning it (matches initial spawning code, fixes maps where the flags are above teleporters but not set to be floating)
---

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
index 6dd1b1e90..08bb7be94 100644
--- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
@@ -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;