Merge branch 'master' into TimePath/unified_weapons

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

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index b3fe1b1ef69a19bc259aa3ae90dea9c875f2c4d8..e1796bdf235a4d6bee4873a3e53d9e95c1357048 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -128,7 +128,7 @@ vector Draw_ArcBeam_callback_last_bottom; // NOTE: in same coordinate system as
 #endif
 #ifdef IMPLEMENTATION
 #ifdef SVQC
-void spawnfunc_weapon_arc(void) { weapon_defaultspawnfunc(WEP_ARC.m_id); }
+spawnfunc(weapon_arc) { weapon_defaultspawnfunc(WEP_ARC.m_id); }
 
 float W_Arc_Beam_Send(entity to, int sf)
 {SELFPARAM();
@@ -677,7 +677,7 @@ void Arc_Smoke()
 
                                if((!actor.arc_beam) || wasfreed(actor.arc_beam))
                                {
-                                       if(weapon_prepareattack(actor, fire2, 0))
+                                       if(weapon_prepareattack(thiswep, actor, fire2, 0))
                                        {
                                                W_Arc_Beam(fire2);
 
@@ -702,7 +702,7 @@ void Arc_Smoke()
 
                        #if 0
                        if(fire2)
-                       if(weapon_prepareattack(actor, true, autocvar_g_balance_arc_secondary_refire))
+                       if(weapon_prepareattack(thiswep, actor, true, autocvar_g_balance_arc_secondary_refire))
                        {
                                W_Arc_Attack2();
                                actor.arc_count = autocvar_g_balance_arc_secondary_count;