X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hagar.qc;h=76103f347e34fa50c6d16c849f6ee0dc0c15f2ac;hb=0874b330f0ccab996c658c73c23e267626c7d2df;hp=76d2f9414aef874b2a883460bd22c64d3d0867d9;hpb=8249c3a8e3cb9b205f707caacf8756f651772a61;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 76d2f9414..76103f347 100644
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -25,10 +25,15 @@ void W_Hagar_Damage (entity inflictor, entity attacker, float damage, float deat
 	if (self.health <= 0)
 		return;
 		
-	float is_linkexplode = ((inflictor.realowner == self.realowner) 
-		&& ((inflictor.projectiledeathtype & HITTYPE_SECONDARY) && (self.projectiledeathtype & HITTYPE_SECONDARY))
-		&& autocvar_g_balance_hagar_secondary_load_linkexplode);
-		
+	float is_linkexplode = ( ((inflictor.owner != world) ? (inflictor.owner == self.owner) : TRUE)
+		&& (inflictor.projectiledeathtype & HITTYPE_SECONDARY) 
+		&& (self.projectiledeathtype & HITTYPE_SECONDARY));
+	
+	if(is_linkexplode)
+		is_linkexplode = (is_linkexplode && autocvar_g_balance_hagar_secondary_load_linkexplode);
+	else
+		is_linkexplode = -1; // not secondary load, so continue as normal without exception.
+
 	if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, is_linkexplode))
 		return; // g_projectiles_damage says to halt
 
@@ -62,7 +67,7 @@ void W_Hagar_Touch2 (void)
 
 void W_Hagar_Attack (void)
 {
-	local entity missile;
+	entity missile;
 
 	W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_reload_ammo);
 
@@ -104,7 +109,7 @@ void W_Hagar_Attack (void)
 
 void W_Hagar_Attack2 (void)
 {
-	local entity missile;
+	entity missile;
 
 	W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_secondary_ammo, autocvar_g_balance_hagar_reload_ammo);
 
@@ -150,9 +155,9 @@ void W_Hagar_Attack2_Load_Release (void)
 {
 	// time to release the rockets we've loaded
 
-	local entity missile;
-	local float counter, shots, spread_pershot;
-	local vector s;
+	entity missile;
+	float counter, shots, spread_pershot;
+	vector s;
 	vector forward, right, up;
 
 	if(!self.hagar_load)
@@ -231,7 +236,7 @@ void W_Hagar_Attack2_Load (void)
 {
 	// loadable hagar secondary attack, must always run each frame
 
-	local float loaded, enough_ammo;
+	float loaded, enough_ammo;
 	loaded = self.hagar_load >= autocvar_g_balance_hagar_secondary_load_max;
 
 	// this is different than WR_CHECKAMMO when it comes to reloading
@@ -344,7 +349,7 @@ float w_hagar(float req)
 		}
 	else if (req == WR_THINK)
 	{
-		local float loadable_secondary;
+		float loadable_secondary;
 		loadable_secondary = autocvar_g_balance_hagar_secondary_load && autocvar_g_balance_hagar_secondary;
 
 		if (loadable_secondary)
@@ -427,7 +432,7 @@ float w_hagar(float req)
 			W_Reload(min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo), autocvar_g_balance_hagar_reload_ammo, autocvar_g_balance_hagar_reload_time, "weapons/reload.wav");
 	}
 	return TRUE;
-};
+}
 #endif
 #ifdef CSQC
 float w_hagar(float req)
@@ -454,13 +459,13 @@ float w_hagar(float req)
 		precache_sound("weapons/hagexp3.wav");
 	}
 	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = _("%s played with tiny rockets");
+		w_deathtypestring = _("%s played with tiny hagar rockets");
 	else if (req == WR_KILLMESSAGE)
 	{
 		if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH
-			w_deathtypestring = _("%s hoped %s's missiles wouldn't bounce");
+			w_deathtypestring = _("%s was pummeled with a burst of hagar rockets by %s");
 		else // unchecked: SPLASH, SECONDARY
-			w_deathtypestring = _("%s was pummeled by %s");
+			w_deathtypestring = _("%s was pummeled with hagar rockets by %s");
 	}
 	return TRUE;
 }