X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fvaporizer.qc;h=6bed925d9fcb1a0b7d2b4e7e4a8f39f425fa6eeb;hb=91b5b85f82da949105551eb0ec01888ec52e8a99;hp=13c3fef8c691c228a1d55cbc5e6784df94d157b4;hpb=c89dfaa4d0342b98c320621557973a65114fbdf4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index 13c3fef8c..6bed925d9 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -268,7 +268,7 @@ void W_RocketMinsta_Attack3 (void) } } -float W_Vaporizer(float req) +float W_Vaporizer(entity thiswep, float req) {SELFPARAM(); float ammo_amount; float vaporizer_ammo; @@ -292,9 +292,9 @@ float W_Vaporizer(float req) { // if the laser uses load, we also consider its ammo for reloading if(WEP_CVAR(vaporizer, reload_ammo) && WEP_CVAR_SEC(vaporizer, ammo) && self.clip_load < min(vaporizer_ammo, WEP_CVAR_SEC(vaporizer, ammo))) // forced reload - WEP_ACTION(self.weapon, WR_RELOAD); + _WEP_ACTION(self.weapon, WR_RELOAD); else if(WEP_CVAR(vaporizer, reload_ammo) && self.clip_load < vaporizer_ammo) // forced reload - WEP_ACTION(self.weapon, WR_RELOAD); + _WEP_ACTION(self.weapon, WR_RELOAD); if(self.BUTTON_ATCK && (self.ammo_cells || !autocvar_g_rm) && !forbidWeaponUse(self)) { if(weapon_prepareattack(0, WEP_CVAR_PRI(vaporizer, refire))) @@ -424,7 +424,7 @@ float W_Vaporizer(float req) } #endif #ifdef CSQC -float W_Vaporizer(float req) +float W_Vaporizer(entity thiswep, float req) {SELFPARAM(); switch(req) {