X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hlac.qc;h=2eb2918ed6c41a138683ff19df07ee427e8ebb8e;hb=fb61c977ddeed686ef587fd54e40f55a4bdc2322;hp=4f41a165843f92fbb848bcc7e14e2b3de4b4903e;hpb=70b696e4e2bbe7322bf580be42961b2d5a159f31;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index 4f41a1658..2eb2918ed 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -19,7 +19,7 @@ void W_HLAC_Touch (void) void W_HLAC_Attack (void) { - local entity missile; + entity missile; float spread; W_DecreaseAmmo(ammo_cells, autocvar_g_balance_hlac_primary_ammo, autocvar_g_balance_hlac_reload_ammo); @@ -68,7 +68,7 @@ void W_HLAC_Attack (void) void W_HLAC_Attack2f (void) { - local entity missile; + entity missile; float spread; spread = autocvar_g_balance_hlac_secondary_spread; @@ -153,7 +153,7 @@ void HLAC_fire1_02() { weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hlac_primary_animtime, w_ready); } -}; +} void spawnfunc_weapon_hlac (void) { @@ -205,13 +205,13 @@ float w_hlac(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_cells >= autocvar_g_balance_hlac_primary_ammo; - ammo_amount += self.weapon_load[WEP_HLAC] >= autocvar_g_balance_hlac_primary_ammo; + ammo_amount += self.(weapon_load[WEP_HLAC]) >= autocvar_g_balance_hlac_primary_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_cells >= autocvar_g_balance_hlac_secondary_ammo; - ammo_amount += self.weapon_load[WEP_HLAC] >= autocvar_g_balance_hlac_secondary_ammo; + ammo_amount += self.(weapon_load[WEP_HLAC]) >= autocvar_g_balance_hlac_secondary_ammo; return ammo_amount; } else if (req == WR_RELOAD) @@ -219,7 +219,7 @@ float w_hlac(float req) W_Reload(min(autocvar_g_balance_hlac_primary_ammo, autocvar_g_balance_hlac_secondary_ammo), autocvar_g_balance_hlac_reload_ammo, autocvar_g_balance_hlac_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_hlac(float req) @@ -230,7 +230,7 @@ float w_hlac(float req) org2 = w_org + w_backoff * 6; pointparticles(particleeffectnum("laser_impact"), org2, w_backoff * 1000, 1); if(!w_issilent) - asound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM); } else if(req == WR_PRECACHE) { @@ -239,7 +239,7 @@ float w_hlac(float req) else if (req == WR_SUICIDEMESSAGE) w_deathtypestring = _("%s should have used a smaller gun"); else if (req == WR_KILLMESSAGE) - w_deathtypestring = _("%s was cut down by %s"); + w_deathtypestring = _("%s was cut down with a HLAC by %s"); return TRUE; } #endif