X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minelayer.qc;h=afe37b56f7b6680bcd143f88d0a460288b11481c;hb=30cd3220d0370aa10dfb62eeb2ee3145d56b1c68;hp=f6d0616d80f9e493ccee487713fda6a3e215f161;hpb=b87370239d9eacc2cf1d258c5f918049262d18bc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index f6d0616d8..afe37b56f 100644
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -242,8 +242,15 @@ void W_Mine_Damage (entity inflictor, entity attacker, float damage, float death
 {
 	if (self.health <= 0)
 		return;
+		
+	float is_from_enemy = (inflictor.realowner != self.realowner);
+		
+	if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, (is_from_enemy ? 1 : -1)))
+		return; // g_projectiles_damage says to halt
+		
 	self.health = self.health - damage;
 	self.angles = vectoangles(self.velocity);
+	
 	if (self.health <= 0)
 		W_PrepareExplosionByDamage(attacker, W_Mine_Explode);
 }
@@ -285,6 +292,7 @@ void W_Mine_Attack (void)
 	mine.damageforcescale = autocvar_g_balance_minelayer_damageforcescale;
 	mine.health = autocvar_g_balance_minelayer_health;
 	mine.event_damage = W_Mine_Damage;
+	mine.damagedbycontents = TRUE;
 
 	mine.movetype = MOVETYPE_TOSS;
 	PROJECTILE_MAKETRIGGER(mine);
@@ -487,7 +495,7 @@ float w_minelayer(float req)
 		if (ATTACK_FINISHED(self) <= time || self.weapon != WEP_MINE_LAYER)
 		{
 			ammo_amount = self.ammo_rockets >= autocvar_g_balance_minelayer_ammo;
-			ammo_amount += self.weapon_load[WEP_MINE_LAYER] >= autocvar_g_balance_minelayer_ammo;
+			ammo_amount += self.(weapon_load[WEP_MINE_LAYER]) >= autocvar_g_balance_minelayer_ammo;
 			return ammo_amount;
 		}
 	}
@@ -503,7 +511,7 @@ float w_minelayer(float req)
 		W_Reload(autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav");
 	}
 	return TRUE;
-};
+}
 #endif
 #ifdef CSQC
 float w_minelayer(float req)
@@ -521,7 +529,10 @@ float w_minelayer(float req)
 		precache_sound("weapons/mine_exp.wav");
 	}
 	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = _("%s exploded");
+		if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
+			w_deathtypestring = _("%s blew themself up with their minelayer");
+		else
+			w_deathtypestring = _("%s forgot about their mine");
 	else if (req == WR_KILLMESSAGE)
 	{
 		if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)