From 37e27afc3274290a93bb972059bbdd0d042be621 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 14 Nov 2014 05:37:17 +1100 Subject: [PATCH] Allow g_weaponarena 1 to do same function as g_weaponarena all --- qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c | 6 +++--- qcsrc/server/miscfunctions.qc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c index 18c376b503..055f5449f3 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c @@ -29,7 +29,7 @@ string WeaponArenaString() s = cvar_string("g_weaponarena"); if(s == "0") return ""; - if(s == "all") + if(s == "all" || s == "1") return _("All Weapons Arena"); if(s == "most") return _("Most Weapons Arena"); @@ -130,7 +130,7 @@ float checkCompatibility_newtoys(entity me) return 0; if(cvar_string("g_weaponarena") == "most") return 1; - if(cvar_string("g_weaponarena") == "all") + if(cvar_string("g_weaponarena") == "all" || cvar_string("g_weaponarena") == "1") return 1; if(cvar_string("g_weaponarena") != "0") return 0; @@ -142,7 +142,7 @@ float checkCompatibility_weaponarena_weapon(entity me) return 0; if(cvar_string("g_weaponarena") == "most") return 0; - if(cvar_string("g_weaponarena") == "all") + if(cvar_string("g_weaponarena") == "all" || cvar_string("g_weaponarena") == "1") return 0; if(cvar_string("g_weaponarena") == "0") return 0; diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 55e01b2453..40421bbc0f 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -708,7 +708,7 @@ void readplayerstartcvars() { // forcibly turn off weaponarena } - else if (s == "all") + else if (s == "all" || s == "1") { g_weaponarena = 1; g_weaponarena_list = "All Weapons"; -- 2.39.2