Merge branch 'master' into TimePath/universal_weapons

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

diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc
index 8001ce15e82a041cefc4f68cc29d54be3b7bb3dd..84d7335869a633b5a64bf2638cbb159a088a9ff8 100644 (file)
--- a/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@ -387,7 +387,7 @@ void W_Hagar_Attack2_Load(void)
                self.hagar_warning = false;
 
                // we aren't checking ammo during an attack, so we must do it here
-               if(!(WEP_ACTION(self.weapon, WR_CHECKAMMO1) + WEP_ACTION(self.weapon, WR_CHECKAMMO2)))
+               if(!(_WEP_ACTION(self.weapon, WR_CHECKAMMO1) + _WEP_ACTION(self.weapon, WR_CHECKAMMO2)))
                if(!(self.items & IT_UNLIMITED_WEAPON_AMMO))
                {
                        // note: this doesn't force the switch
@@ -397,7 +397,7 @@ void W_Hagar_Attack2_Load(void)
        }
 }
 
-bool W_Hagar(int req)
+bool W_Hagar(entity thiswep, int req)
 {SELFPARAM();
        float ammo_amount;
        switch(req)
@@ -419,7 +419,7 @@ bool W_Hagar(int req)
                        if(loadable_secondary)
                                W_Hagar_Attack2_Load(); // must always run each frame
                        if(autocvar_g_balance_hagar_reload_ammo && self.clip_load < min(WEP_CVAR_PRI(hagar, ammo), WEP_CVAR_SEC(hagar, ammo))) // forced reload
-                               WEP_ACTION(self.weapon, WR_RELOAD);
+                               _WEP_ACTION(self.weapon, WR_RELOAD);
                        else if(self.BUTTON_ATCK && !self.hagar_load && !self.hagar_loadblock) // not while secondary is loaded or awaiting reset
                        {
                                if(weapon_prepareattack(0, WEP_CVAR_PRI(hagar, refire)))
@@ -519,7 +519,7 @@ bool W_Hagar(int req)
 }
 #endif
 #ifdef CSQC
-bool W_Hagar(int req)
+bool W_Hagar(entity thiswep, int req)
 {SELFPARAM();
        switch(req)
        {