From a26d3abc46868fa7259c717641c4011be535b95c Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 27 Feb 2021 22:17:51 +1000 Subject: [PATCH] Fix a Vortex charge rate inconsistency with g_balance_vortex_charge_always --- qcsrc/common/weapons/weapon/vortex.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index b20f6bda3..0e967c92e 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -164,7 +164,7 @@ void W_Vortex_Attack(Weapon thiswep, entity actor, .entity weaponentity, float i void W_Vortex_Charge(entity actor, .entity weaponentity, float dt) { if(WEP_CVAR(vortex, charge) && actor.(weaponentity).vortex_charge < WEP_CVAR(vortex, charge_limit)) - actor.(weaponentity).vortex_charge = min(1, actor.(weaponentity).vortex_charge + WEP_CVAR(vortex, charge_rate) * dt / W_TICSPERFRAME); + actor.(weaponentity).vortex_charge = min(1, actor.(weaponentity).vortex_charge + WEP_CVAR(vortex, charge_rate) * dt); } METHOD(Vortex, wr_aim, void(entity thiswep, entity actor, .entity weaponentity)) @@ -180,7 +180,7 @@ METHOD(Vortex, wr_aim, void(entity thiswep, entity actor, .entity weaponentity)) METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire)) { if(!WEP_CVAR(vortex, charge_always)) - W_Vortex_Charge(actor, weaponentity, frametime); + W_Vortex_Charge(actor, weaponentity, frametime / W_TICSPERFRAME); if(WEP_CVAR_SEC(vortex, chargepool)) if(actor.(weaponentity).vortex_chargepool_ammo < 1) -- 2.39.2