Fix g_rocket_flying_disabledelays (below 0 means proximity, not instant)
authorMario <mario.mario@y7mail.com>
Sat, 7 Sep 2019 12:23:21 +0000 (22:23 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 7 Sep 2019 12:23:21 +0000 (22:23 +1000)
qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc
qcsrc/common/weapons/weapon/devastator.qc

index 6e4c240..58e2056 100644 (file)
@@ -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;
        }
 }
 
index a77136b..fc42f39 100644 (file)
@@ -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;