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 6e4c240813b9d6ab5a4b3c3a1ea4463271f2df03..58e20568eddf02d9d1ddd90616af3890d2e9ceb8 100644 (file)
--- 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 a77136b397f874bdd56f1b615125cc8d4f43f415..fc42f39d71763909615daaedb2c6790445f1aa51 100644 (file)
--- 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;