From b57e32eee7a22dc1db96db994056bd99163a70e8 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 24 Dec 2015 10:40:24 +1000 Subject: [PATCH] Loopify nix --- qcsrc/common/mutators/mutator/nix/nix.qc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/qcsrc/common/mutators/mutator/nix/nix.qc b/qcsrc/common/mutators/mutator/nix/nix.qc index a6d42d58e..2f4a7cd63 100644 --- a/qcsrc/common/mutators/mutator/nix/nix.qc +++ b/qcsrc/common/mutators/mutator/nix/nix.qc @@ -43,11 +43,7 @@ REGISTER_MUTATOR(nix, cvar("g_nix") && !cvar("g_instagib") && !cvar("g_overkill" nix_nextchange = 0; nix_nextweapon = 0; - for (int i = WEP_FIRST; i <= WEP_LAST; ++i) - if (NIX_CanChooseWeapon(i)) { - Weapon w = Weapons_from(i); - w.wr_init(w); - } + FOREACH(Weapons, it != WEP_Null && NIX_CanChooseWeapon(it.m_id), LAMBDA(it.wr_init(it))); } MUTATOR_ONROLLBACK_OR_REMOVE @@ -98,11 +94,11 @@ bool NIX_CanChooseWeapon(int wpn) } void NIX_ChooseNextWeapon() { - float j; RandomSelection_Init(); - for(j = WEP_FIRST; j <= WEP_LAST; ++j) - if(NIX_CanChooseWeapon(j)) - RandomSelection_Add(world, j, string_null, 1, (j != nix_weapon)); + FOREACH(Weapons, it != WEP_Null, LAMBDA( + if(NIX_CanChooseWeapon(it.m_id)) + RandomSelection_Add(world, it.m_id, string_null, 1, (it.m_id != nix_weapon)); + )); nix_nextweapon = RandomSelection_chosen_float; } -- 2.39.2