Hook: merge offhand and weapon behaviour

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

diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc
index dd5d8c241bd48efd50e2ca1ca6c1b1f8e836316d..b0761b2c2ad1006623ab473ca9b7cbe912476c99 100644 (file)
--- a/qcsrc/common/weapons/weapon/fireball.qc
+++ b/qcsrc/common/weapons/weapon/fireball.qc
@@ -376,7 +376,7 @@ void W_Fireball_Attack2(void)
                        if(fire1)
                        {
                                if(time >= actor.fireball_primarytime)
-                               if(weapon_prepareattack(actor, false, WEP_CVAR_PRI(fireball, refire)))
+                               if(weapon_prepareattack(thiswep, actor, false, WEP_CVAR_PRI(fireball, refire)))
                                {
                                        W_Fireball_Attack1_Frame0(thiswep, actor, fire1, fire2);
                                        actor.fireball_primarytime = time + WEP_CVAR_PRI(fireball, refire2) * W_WeaponRateFactor();
@@ -384,7 +384,7 @@ void W_Fireball_Attack2(void)
                        }
                        else if(fire2)
                        {
-                               if(weapon_prepareattack(actor, true, WEP_CVAR_SEC(fireball, refire)))
+                               if(weapon_prepareattack(thiswep, actor, true, WEP_CVAR_SEC(fireball, refire)))
                                {
                                        W_Fireball_Attack2();
                                        weapon_thinkf(actor, WFRAME_FIRE2, WEP_CVAR_SEC(fireball, animtime), w_ready);