From: Mario Date: Wed, 23 Dec 2015 23:53:51 +0000 (+1000) Subject: Loopify weapon arena string X-Git-Tag: xonotic-v0.8.2~1443 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=53d5512f3e6fd64e37bbcfe210752dd759e04177;p=xonotic%2Fxonotic-data.pk3dir.git Loopify weapon arena string --- diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc index 8b9ddf9b2..e45e9595f 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc @@ -28,8 +28,7 @@ string weaponarenastring_cvar; string WeaponArenaString() { string s; - float n, i, j; - entity e; + float n, i; s = cvar_string("g_weaponarena"); if(s == "0") return ""; @@ -50,12 +49,10 @@ string WeaponArenaString() s = ""; for(i = 0; i < n; ++i) { - for(j = WEP_FIRST; j <= WEP_LAST; ++j) - { - e = Weapons_from(j); - if(argv(i) == e.netname) - s = strcat(s, " & ", e.m_name); - } + FOREACH(Weapons, it != WEP_Null, LAMBDA( + if(argv(i) == it.netname) + s = strcat(s, " & ", it.m_name); + )); } s = sprintf(_("%s Arena"), substring(s, 3, strlen(s) - 3));