X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hlac.qc;h=142a231923214be2cfd8a91b921fa00e88d56d15;hb=9bc9f1ca09aa498304c26b9da970e48da05f3124;hp=2eb2918ed6c41a138683ff19df07ee427e8ebb8e;hpb=1c62f7a27b54573d6f25a6b936026c549df2c6ef;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index 2eb2918ed..142a23192 100644
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(HLAC, w_hlac, IT_CELLS, 6, WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "hlac", "hlac", _("Heavy Laser Assault Cannon"))
+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"))
 #else
 #ifdef SVQC
 
@@ -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);
@@ -102,6 +102,7 @@ void W_HLAC_Attack2f (void)
     missile.nextthink = time + autocvar_g_balance_hlac_secondary_lifetime;
 
 	missile.flags = FL_PROJECTILE;
+	missile.missile_flags = MIF_SPLASH; 
 	missile.projectiledeathtype = WEP_HLAC | HITTYPE_SECONDARY;
 
 	CSQCProjectile(missile, TRUE, PROJECTILE_HLAC, TRUE);
@@ -218,6 +219,14 @@ 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
@@ -236,10 +245,6 @@ float w_hlac(float req)
 	{
 		precache_sound("weapons/laserimpact.wav");
 	}
-	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 with a HLAC by %s");
 	return TRUE;
 }
 #endif