From 80f6ec3a7a17b2c47b8ebaf92f79c3ff8d1e885a Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 7 Sep 2019 22:23:21 +1000 Subject: [PATCH] Fix g_rocket_flying_disabledelays (below 0 means proximity, not instant) --- qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc | 2 +- qcsrc/common/weapons/weapon/devastator.qc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc b/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc index 6e4c240813..58e20568ed 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 a77136b397..fc42f39d71 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; -- 2.39.2