From: Mario <mario.mario@y7mail.com>
Date: Sat, 7 Sep 2019 12:23:21 +0000 (+1000)
Subject: Fix g_rocket_flying_disabledelays (below 0 means proximity, not instant)
X-Git-Tag: xonotic-v0.8.5~1294
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80f6ec3a7a17b2c47b8ebaf92f79c3ff8d1e885a;p=xonotic%2Fxonotic-data.pk3dir.git

Fix g_rocket_flying_disabledelays (below 0 means proximity, not instant)
---

diff --git a/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc b/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc
index 6e4c24081..58e20568e 100644
--- a/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc
+++ b/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc
@@ -11,7 +11,7 @@ MUTATOR_HOOKFUNCTION(rocketflying, EditProjectile)
 	if(autocvar_g_rocket_flying_disabledelays && (proj.classname == "rocket" || proj.classname == "mine"))
 	{
 		// kill detonate delay of rockets
-		proj.spawnshieldtime = -1;
+		proj.spawnshieldtime = time;
 	}
 }
 
diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc
index a77136b39..fc42f39d7 100644
--- a/qcsrc/common/weapons/weapon/devastator.qc
+++ b/qcsrc/common/weapons/weapon/devastator.qc
@@ -317,7 +317,7 @@ void W_Devastator_Attack(Weapon thiswep, entity actor, .entity weaponentity, int
 	if(WEP_CVAR(devastator, detonatedelay) >= 0)
 		missile.spawnshieldtime = time + WEP_CVAR(devastator, detonatedelay);
 	else
-		missile.spawnshieldtime = -1;
+		missile.spawnshieldtime = -1; // NOTE: proximity based when rocket jumping
 	missile.pushltime = time + WEP_CVAR(devastator, guidedelay);
 	missile.classname = "rocket";
 	missile.bot_dodge = true;