From 8d41db21b0bdbb2383ff9716a4a1e6feacd3ca71 Mon Sep 17 00:00:00 2001
From: mand1nga <mand1nga@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 21 Aug 2009 00:06:46 +0000
Subject: [PATCH] Minstanex fixes by terencehil (#484)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7481 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/miscfunctions.qc |  1 +
 data/qcsrc/server/t_items.qc       | 11 +++++++----
 data/qcsrc/server/w_minstanex.qc   | 23 ++++++++++++-----------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 39b2314a2..331fbc9b2 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1525,6 +1525,7 @@ void precache()
     precache_sound ("announcer/robotic/1fragleft.wav");
     precache_sound ("announcer/robotic/2fragsleft.wav");
     precache_sound ("announcer/robotic/3fragsleft.wav");
+    precache_sound ("announcer/robotic/terminated.wav");
     if (g_minstagib)
     {
         precache_sound ("announcer/robotic/lastsecond.wav");
diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 560e13b02..4aebf9bb0 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -175,10 +175,13 @@ float Item_GiveTo(entity item, entity player)
 			pickedup = TRUE;
 			// play some cool sounds ;)
 			centerprint(player, "\n");
-			if(player.health <= 5)
-				announce(player, "announcer/robotic/lastsecond.wav");
-			else if(player.health < 50)
-				announce(player, "announcer/robotic/narrowly.wav");
+			if (clienttype(player) == CLIENTTYPE_REAL)
+			{
+				if(player.health <= 5)
+					play2(player, "announcer/robotic/lastsecond.wav");
+				else if(player.health < 50)
+					play2(player, "announcer/robotic/narrowly.wav");
+			}
 			// sound not available
 			// else if(item.items == IT_CELLS)
 			//	play2(player, "announce/robotic/ammo.wav");
diff --git a/data/qcsrc/server/w_minstanex.qc b/data/qcsrc/server/w_minstanex.qc
index 719ff0014..cc84630d1 100644
--- a/data/qcsrc/server/w_minstanex.qc
+++ b/data/qcsrc/server/w_minstanex.qc
@@ -99,65 +99,66 @@ void minstagib_ammocheck (void)
 			Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/terminated.wav");
 		}
-		if (self.health == 10)
+		else if (self.health == 10)
 		{
 			centerprint(self, "^11^7 second left to find some ammo\n");
 			Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/1.wav");
 		}
-		if (self.health == 20)
+		else if (self.health == 20)
 		{
 			centerprint(self, "^12^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/2.wav");
 		}
-		if (self.health == 30)
+		else if (self.health == 30)
 		{
 			centerprint(self, "^13^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/3.wav");
 		}
-		if (self.health == 40)
+		else if (self.health == 40)
 		{
 			centerprint(self, "^14^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/4.wav");
 		}
-		if (self.health == 50)
+		else if (self.health == 50)
 		{
 			centerprint(self, "^15^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/5.wav");
 		}
-		if (self.health == 60)
+		else if (self.health == 60)
 		{
 			centerprint(self, "^36^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/6.wav");
 		}
-		if (self.health == 70)
+		else if (self.health == 70)
 		{
 			centerprint(self, "^37^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/7.wav");
 		}
-		if (self.health == 80)
+		else if (self.health == 80)
 		{
 			centerprint(self, "^38^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/8.wav");
 		}
-		if (self.health == 90)
+		else if (self.health == 90)
 		{
 			centerprint(self, "^39^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			announce(self, "announcer/robotic/9.wav");
 		}
-		if (self.health == 100)
+		else if (self.health == 100)
 		{
 			centerprint(self, "get some ammo or\nyou'll be dead in ^310^7 seconds...");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
-			announce(self, "announcer/robotic/10.wav");
+			if not(self.flags & FL_GODMODE)
+				announce(self, "announcer/robotic/10.wav");
 		}
 	}
 	self.minstagib_nextthink = time + 1;
-- 
2.39.2