Merge branch 'master' into Mario/balance_v2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / hlac.qc

diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc
index 4398386704a0675002482479b9b08ae3bef888e5..3c158f60814e07524c6a483de523d3cfb1997489 100644 (file)
--- a/qcsrc/common/weapons/weapon/hlac.qc
+++ b/qcsrc/common/weapons/weapon/hlac.qc
@@ -214,7 +214,7 @@ void W_HLAC_Attack2_Frame(Weapon thiswep)
                METHOD(HLAC, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire))
                {
                        if(autocvar_g_balance_hlac_reload_ammo && actor.clip_load < min(WEP_CVAR_PRI(hlac, ammo), WEP_CVAR_SEC(hlac, ammo))) { // forced reload
-                               thiswep.wr_reload(thiswep);
+                               thiswep.wr_reload(thiswep, actor, weaponentity);
                        } else if(fire & 1)
                        {
                                if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(hlac, refire)))
@@ -246,7 +246,7 @@ void W_HLAC_Attack2_Frame(Weapon thiswep)
                        ammo_amount += self.(weapon_load[WEP_HLAC.m_id]) >= WEP_CVAR_SEC(hlac, ammo);
                        return ammo_amount;
                }
-               METHOD(HLAC, wr_reload, void(entity thiswep))
+               METHOD(HLAC, wr_reload, void(entity thiswep, entity actor, .entity weaponentity))
                {
                        W_Reload(self, min(WEP_CVAR_PRI(hlac, ammo), WEP_CVAR_SEC(hlac, ammo)), SND(RELOAD));
                }