From: Mario <mario.mario@y7mail.com>
Date: Tue, 4 Jun 2013 19:40:52 +0000 (+1000)
Subject: Fix player not dying from lack of ammo if they have extra lives
X-Git-Tag: xonotic-v0.7.0~6^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e64f016f719822b070c214fcc46262efde321c9;p=xonotic%2Fxonotic-data.pk3dir.git

Fix player not dying from lack of ammo if they have extra lives
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 496b0973b..68a2de343 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -416,6 +416,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	frag_inflictor = inflictor;
 	frag_attacker = attacker;
 	frag_target = self;
+	frag_damage = damage;
 	damage_take = take;
 	damage_save = save;
 	damage_force = force;
diff --git a/qcsrc/server/mutators/mutator_minstagib.qc b/qcsrc/server/mutators/mutator_minstagib.qc
index 28e8623d6..021a2b083 100644
--- a/qcsrc/server/mutators/mutator_minstagib.qc
+++ b/qcsrc/server/mutators/mutator_minstagib.qc
@@ -195,7 +195,7 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayerPhysics)
 MUTATOR_HOOKFUNCTION(minstagib_SplitHealthArmor)
 {
 	damage_save = 0;
-	//damage_take = frag_damage; // frag_damage isn't even set here?!
+	damage_take = frag_damage;
 	
 	return FALSE;
 }
@@ -210,7 +210,7 @@ MUTATOR_HOOKFUNCTION(minstagib_ForbidThrowing)
 
 MUTATOR_HOOKFUNCTION(minstagib_PlayerDamage)
 {
-	if(autocvar_g_friendlyfire == 0 && !IsDifferentTeam(frag_target, frag_attacker) && IS_PLAYER(frag_target))
+	if(autocvar_g_friendlyfire == 0 && !IsDifferentTeam(frag_target, frag_attacker) && IS_PLAYER(frag_target) && IS_PLAYER(frag_attacker))
 		frag_damage = 0;
 		
 	if(IS_PLAYER(frag_target))
@@ -223,7 +223,9 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayerDamage)
 			frag_damage = 0;
 		}
 		
-		if (frag_target.armorvalue && (frag_deathtype == WEP_MINSTANEX) && frag_damage)
+		if(IS_PLAYER(frag_attacker))
+		if(DEATH_ISWEAPON(frag_deathtype, WEP_MINSTANEX))
+		if(frag_target.armorvalue)
 		{
 			frag_target.armorvalue -= 1;
 			Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_target.armorvalue);
@@ -231,27 +233,30 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayerDamage)
 			frag_target.hitsound += 1;
 			frag_attacker.hitsound += 1; // TODO change this to a future specific hitsound for armor hit
 		}
+		
+		if(IS_PLAYER(frag_attacker))
 		if (DEATH_ISWEAPON(frag_deathtype, WEP_LASER))
 		{
 			frag_damage = 0;
 			frag_mirrordamage = 0;
 			if (frag_target != frag_attacker)
 			{
-				if ((frag_target.health >= 1) && IS_PLAYER(frag_target))
+				if (frag_target.health >= 1)
 					Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_MINSTA_SECONDARY);
 				frag_force = '0 0 0';
 				// keep mirrorfrag_force
-				frag_attacker = frag_target;
+				//frag_attacker = frag_target;
 			}
 		}
 	}
 	
+	if(IS_PLAYER(frag_attacker))
 	if(frag_mirrordamage > 0)
 	{
 		// just lose extra LIVES, don't kill the player for mirror damage
 		if(frag_attacker.armorvalue > 0)
 		{
-			frag_attacker.armorvalue = frag_attacker.armorvalue - 1;
+			frag_attacker.armorvalue -= 1;
 			Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_attacker.armorvalue);
 			frag_attacker.hitsound += 1;
 		}