From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 8 Feb 2011 09:20:49 +0000 (+0100)
Subject: make mines "super aggressive" (turn off the friend-nearby check) when it is expired
X-Git-Tag: xonotic-v0.5.0~311^2~34
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6bd2d6662ebfa9a990ee53b5219b6f5028bb2acb;p=xonotic%2Fxonotic-data.pk3dir.git

make mines "super aggressive" (turn off the friend-nearby check) when it is expired
---

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 50aed0e1e..7e4749cd5 100644
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -110,7 +110,7 @@ void W_Mine_RemoteExplode ()
 void W_Mine_ProximityExplode ()
 {
 	// make sure no friend is in the mine's radius. If there is any, explosion is delayed until he's at a safe distance
-	if(autocvar_g_balance_minelayer_protection)
+	if(autocvar_g_balance_minelayer_protection && self.minelayer_mines == 0)
 	{
 		entity head;
 		head = findradius(self.origin, autocvar_g_balance_minelayer_radius);
@@ -136,8 +136,10 @@ void W_Mine_Think (void)
 	// TODO: replace this mine_trigger.wav sound with a real countdown
 	if ((time > self.cnt) && (!self.mine_time))
 	{
-		spamsound (self, CHAN_PROJECTILE, "weapons/mine_trigger.wav", VOL_BASE, ATTN_NORM);
+		if(autocvar_g_balance_minelayer_lifetime_countdown > 0)
+			spamsound (self, CHAN_PROJECTILE, "weapons/mine_trigger.wav", VOL_BASE, ATTN_NORM);
 		self.mine_time = time + autocvar_g_balance_minelayer_lifetime_countdown;
+		self.minelayer_mines = 1; // make the mine super aggressive
 	}
 
 	// a player's mines shall explode if he disconnects or dies