Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_hlac.qc

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index 67a1e4e60ac64c6fb462c2b3b104369715a2c2d5..142a231923214be2cfd8a91b921fa00e88d56d15 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -7,7 +7,7 @@ void W_HLAC_Touch (void)
 {
        PROJECTILE_TOUCH;
 
-       self.event_damage = SUB_Null;
+       self.event_damage = func_null;
        
        if(self.projectiledeathtype & HITTYPE_SECONDARY)
                RadiusDamage (self, self.realowner, autocvar_g_balance_hlac_secondary_damage, autocvar_g_balance_hlac_secondary_edgedamage, autocvar_g_balance_hlac_secondary_radius, world, autocvar_g_balance_hlac_secondary_force, self.projectiledeathtype, other);
@@ -220,9 +220,13 @@ 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");
        }
        else if (req == WR_SUICIDEMESSAGE)
+       {
                return WEAPON_HLAC_SUICIDE;
+       }
        else if (req == WR_KILLMESSAGE)
+       {
                return WEAPON_HLAC_MURDER;
+       }
        return TRUE;
 }
 #endif