X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fhlac.qc;h=10907b8acde61d9beb5da6d6510737ef931db4ec;hb=91b5b85f82da949105551eb0ec01888ec52e8a99;hp=074b76053882051306d3daac23a1f78f127537d1;hpb=c89dfaa4d0342b98c320621557973a65114fbdf4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc index 074b76053..10907b8ac 100644 --- a/qcsrc/common/weapons/weapon/hlac.qc +++ b/qcsrc/common/weapons/weapon/hlac.qc @@ -169,7 +169,7 @@ void W_HLAC_Attack_Frame(void) if(self.BUTTON_ATCK) { - if(!WEP_ACTION(self.weapon, WR_CHECKAMMO1)) + if(!_WEP_ACTION(self.weapon, WR_CHECKAMMO1)) if(!(self.items & IT_UNLIMITED_WEAPON_AMMO)) { W_SwitchWeapon_Force(self, w_getbestweapon(self)); @@ -204,7 +204,7 @@ void W_HLAC_Attack2_Frame(void) } } -bool W_HLAC(int req) +bool W_HLAC(entity thiswep, int req) {SELFPARAM(); float ammo_amount; switch(req) @@ -217,7 +217,7 @@ bool W_HLAC(int req) case WR_THINK: { if(autocvar_g_balance_hlac_reload_ammo && self.clip_load < min(WEP_CVAR_PRI(hlac, ammo), WEP_CVAR_SEC(hlac, ammo))) // forced reload - WEP_ACTION(self.weapon, WR_RELOAD); + _WEP_ACTION(self.weapon, WR_RELOAD); else if(self.BUTTON_ATCK) { if(weapon_prepareattack(0, WEP_CVAR_PRI(hlac, refire))) @@ -280,7 +280,7 @@ bool W_HLAC(int req) } #endif #ifdef CSQC -bool W_HLAC(int req) +bool W_HLAC(entity thiswep, int req) {SELFPARAM(); switch(req) {