]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix some redundant checks
authorMario <zacjardine@y7mail.com>
Sun, 30 Aug 2015 04:33:08 +0000 (14:33 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 30 Aug 2015 04:33:08 +0000 (14:33 +1000)
qcsrc/server/mutators/mutator_rocketminsta.qc

index 6b7f293d1144f9af8c6d361dd5ef53e6ee6384e3..07148cc58d02fa455c39c97210e248108ad9ce31 100644 (file)
@@ -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;