X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hlac.qc;h=5959965a6c3414ed1e97b5877a20b342ac3346a5;hb=5c4ae3ec7458cf4e8d07f6eed4fe24fceea13b70;hp=142a231923214be2cfd8a91b921fa00e88d56d15;hpb=e7c63b4a159ba5bed1a4e35d1df9ca19cdef95a2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index 142a23192..5959965a6 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -1,5 +1,15 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(HLAC, w_hlac, IT_CELLS, 6, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "hlac", "hlac", _("Heavy Laser Assault Cannon")) +REGISTER_WEAPON( +/* WEP_##id */ HLAC, +/* function */ w_hlac, +/* ammotype */ IT_CELLS, +/* impulse */ 6, +/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_MID, +/* model */ "hlac", +/* shortname */ "hlac", +/* fullname */ _("Heavy Laser Assault Cannon") +); #else #ifdef SVQC @@ -31,7 +41,7 @@ void W_HLAC_Attack (void) W_SetupShot (self, FALSE, 3, "weapons/lasergun_fire.wav", CH_WEAPON_A, autocvar_g_balance_hlac_primary_damage); pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); - if (!g_norecoil) + if (!autocvar_g_norecoil) { self.punchangle_x = random () - 0.5; self.punchangle_y = random () - 0.5; @@ -119,7 +129,7 @@ void W_HLAC_Attack2 (void) for(i=autocvar_g_balance_hlac_secondary_shots;i>0;--i) W_HLAC_Attack2f(); - if (!g_norecoil) + if (!autocvar_g_norecoil) { self.punchangle_x = random () - 0.5; self.punchangle_y = random () - 0.5; @@ -239,7 +249,7 @@ float w_hlac(float req) org2 = w_org + w_backoff * 6; pointparticles(particleeffectnum("laser_impact"), org2, w_backoff * 1000, 1); if(!w_issilent) - sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTEN_NORM); } else if(req == WR_PRECACHE) {