Merge branch 'master' into TimePath/universal_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 400c950c8cf904b76534d599991e5aa7e5761a4c..4de7814688a0706a5e970952721f1411490cdc4e 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -273,7 +273,7 @@ void W_Arc_Beam_Think(void)
 
                if(self == self.owner.arc_beam) { self.owner.arc_beam = world; }
                setself(self.owner);
-               if(!WEP_ACTION(WEP_ARC.m_id, WR_CHECKAMMO1) && !WEP_ACTION(WEP_ARC.m_id, WR_CHECKAMMO2))
+               if(!WEP_ACTION(WEP_ARC, WR_CHECKAMMO1) && !WEP_ACTION(WEP_ARC, WR_CHECKAMMO2))
                if(!(self.items & IT_UNLIMITED_WEAPON_AMMO))
                {
                        // note: this doesn't force the switch
@@ -631,7 +631,7 @@ void Arc_Smoke()
        }
 }
 
-bool W_Arc(int req)
+bool W_Arc(entity thiswep, int req)
 {SELFPARAM();
        switch(req)
        {
@@ -1509,7 +1509,7 @@ void Ent_ReadArcBeam(float isnew)
        }
 }
 
-bool W_Arc(int req)
+bool W_Arc(entity thiswep, int req)
 {SELFPARAM();
        switch(req)
        {