From 7a4eff25bbbefc9accd6091a8a6232fdff634347 Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 20 Aug 2019 01:57:51 +0200 Subject: [PATCH] Fix #2267 "Teams get shuffled every round in CA and FT" (whenever a sv_cmd command is executed in the console during a round) --- qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc | 4 +++- qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc index 0a8370899..cf2821844 100644 --- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc +++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc @@ -508,6 +508,8 @@ MUTATOR_HOOKFUNCTION(ca, SetWeaponArena) MUTATOR_HOOKFUNCTION(ca, SV_ParseServerCommand) { - shuffleteams_on_reset_map = !allowed_to_spawn; + string cmd_name = M_ARGV(0, string); + if (cmd_name == "shuffleteams") + shuffleteams_on_reset_map = !allowed_to_spawn; return false; } diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index 2dfcf4811..0f37cf1e8 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -612,7 +612,9 @@ MUTATOR_HOOKFUNCTION(ft, FragCenterMessage) MUTATOR_HOOKFUNCTION(ft, SV_ParseServerCommand) { - shuffleteams_on_reset_map = !(round_handler_IsActive() && !round_handler_IsRoundStarted()); + string cmd_name = M_ARGV(0, string); + if (cmd_name == "shuffleteams") + shuffleteams_on_reset_map = !(round_handler_IsActive() && !round_handler_IsRoundStarted()); return false; } -- 2.39.2