From: Mario <mario@smbclan.net>
Date: Fri, 10 Jun 2016 12:28:31 +0000 (+1000)
Subject: Fix some mistakes
X-Git-Tag: xonotic-v0.8.2~846
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fb81e94f3a6fea4185fb6aad360783dc04fd0244;p=xonotic%2Fxonotic-data.pk3dir.git

Fix some mistakes
---

diff --git a/qcsrc/common/mutators/mutator/instagib/instagib.qc b/qcsrc/common/mutators/mutator/instagib/instagib.qc
index 8bd41449e..0f1b199a4 100644
--- a/qcsrc/common/mutators/mutator/instagib/instagib.qc
+++ b/qcsrc/common/mutators/mutator/instagib/instagib.qc
@@ -436,10 +436,9 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, CustomizeWaypoint)
 MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerDies)
 {
 	float frag_deathtype = M_ARGV(3, float);
-	float frag_damage = M_ARGV(4, float);
 
 	if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
-		frag_damage = 1000; // always gib if it was a vaporizer death
+		M_ARGV(4, float) = 1000; // always gib if it was a vaporizer death
 
 	return false;
 }
diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qc b/qcsrc/common/mutators/mutator/overkill/overkill.qc
index a9989be2f..d97e375b7 100644
--- a/qcsrc/common/mutators/mutator/overkill/overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/overkill.qc
@@ -97,25 +97,20 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDamage_Calculate, CBC_ORDER_LAST)
 	entity frag_attacker = M_ARGV(1, entity);
 	entity frag_target = M_ARGV(2, entity);
 	float frag_deathtype = M_ARGV(3, float);
-	float frag_damage = M_ARGV(4, float);
-	vector frag_force = M_ARGV(6, vector);
 
 	if(IS_PLAYER(frag_attacker) && IS_PLAYER(frag_target))
 	if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER))
 	{
-		frag_damage = 0;
-
 		if(frag_attacker != frag_target)
 		if(frag_target.health > 0)
 		if(STAT(FROZEN, frag_target) == 0)
 		if(!IS_DEAD(frag_target))
 		{
 			Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE);
-			frag_force = '0 0 0';
+			M_ARGV(6, vector) = '0 0 0';
 		}
 
-		M_ARGV(4, float) = frag_damage;
-		M_ARGV(6, vector) = frag_force;
+		M_ARGV(4, float) = 0;
 	}
 
 	return false;
diff --git a/qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc b/qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc
index 143c985f6..ca4356ce1 100644
--- a/qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc
+++ b/qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc
@@ -34,10 +34,9 @@ MUTATOR_HOOKFUNCTION(rm, PlayerDies)
 	if(!autocvar_g_rm) { return false; }
 
 	float frag_deathtype = M_ARGV(3, float);
-	float frag_damage = M_ARGV(4, float);
 
 	if(DEATH_ISWEAPON(frag_deathtype, WEP_DEVASTATOR) || DEATH_ISWEAPON(frag_deathtype, WEP_ELECTRO))
-		frag_damage = 1000; // always gib if it was a vaporizer death
+		M_ARGV(4, float) = 1000; // always gib if it was a vaporizer death
 
 	return false;
 }