From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Aug 2015 04:33:08 +0000 (+1000)
Subject: Fix some redundant checks
X-Git-Tag: xonotic-v0.8.2~1972^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52fa6675860780286db642f57a64928daba4c387;p=xonotic%2Fxonotic-data.pk3dir.git

Fix some redundant checks
---

diff --git a/qcsrc/server/mutators/mutator_rocketminsta.qc b/qcsrc/server/mutators/mutator_rocketminsta.qc
index 6b7f293d1..07148cc58 100644
--- a/qcsrc/server/mutators/mutator_rocketminsta.qc
+++ b/qcsrc/server/mutators/mutator_rocketminsta.qc
@@ -5,12 +5,11 @@ MUTATOR_HOOKFUNCTION(rm, PlayerDamage_Calculate)
 	// we do it this way, so rm can be toggled during the match
 	if(!autocvar_g_rm) { return false; }
 
-	if(autocvar_g_rm)
 	if(DEATH_ISWEAPON(frag_deathtype, WEP_DEVASTATOR.m_id))
 	if(frag_attacker == frag_target || frag_target.classname == "nade")
 		frag_damage = 0;
 
-	if(autocvar_g_rm && autocvar_g_rm_laser == 1) //|| autocvar_g_rm_laser == 2)
+	if(autocvar_g_rm_laser)
 	if(DEATH_ISWEAPON(frag_deathtype, WEP_ELECTRO.m_id))
 	if(frag_attacker == frag_target || (round_handler_IsActive() && !round_handler_IsRoundStarted()))
 		frag_damage = 0;