Merge branch 'terencehill/bot_target_push' into 'master'

[xonotic/xonotic-data.pk3dir.git] / commands.cfg

diff --git a/commands.cfg b/commands.cfg
index 308cd0b8e281dbb3245c5c21c830d11bc69d6d6f..d0726bce596e5eeb86dddf360aca5950e70a6762 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -112,7 +112,6 @@ alias tdem "timedemo $1"
 //  menu_cmd (menu command) - menu/command/menu_cmd.qc
 // ===============================================
 alias menu_showwelcomedialog "menu_cmd directmenu Welcome"
-alias menu_showteamselect "menu_cmd directmenu TeamSelect"
 alias menu_showhudexit "menu_cmd directmenu HUDExit"
 alias menu_showhudoptions "menu_cmd directpanelhudmenu ${* ?}"
 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
@@ -150,10 +149,16 @@ alias radar "qc_cmd_cl hud radar ${* ?}"
 alias scoreboard_columns_help "qc_cmd_cl hud scoreboard_columns_help"
 alias scoreboard_columns_set "qc_cmd_cl hud scoreboard_columns_set ${* ?}"
 
+seta team_selection_type 1 "Team selection type: 0 menu, 1 scoreboard"
 set _scoreboard_team_selection_available 0 // set to 1 by CSQC
-alias _team_selection_show1 "_scoreboard_team_selection 1"
-alias _team_selection_show0 menu_showteamselect
-alias team_selection_show "_team_selection_show$_scoreboard_team_selection_available"
+alias _team_selection_show00 "menu_cmd directmenu TeamSelect"
+alias _team_selection_show01 "menu_cmd directmenu TeamSelect"
+alias _team_selection_show10 "menu_cmd directmenu TeamSelect"
+alias _team_selection_show11 "_scoreboard_team_selection 1"
+alias team_selection_show "_team_selection_show${_scoreboard_team_selection_available}${team_selection_type}"
+
+// legacy alias
+alias menu_showteamselect team_selection_show
 
 // ========================================================
 //  cmd (client-to-server command) - server/command/cmd.qc
@@ -375,7 +380,7 @@ set sv_vote_stop 15 "a player can not call a vote again for this many seconds wh
 set sv_vote_majority_factor 0.5        "What percentage of the PLAYERS constitute a majority? (Must be at least 0.5, recommended: 0.5)"
 set sv_vote_majority_factor_of_voted 0.5 "What percentage of the VOTERS constitute a majority too? (Must be at least 0.5, recommended: 0.5)"
 set sv_vote_gamestart 0 "Allow voting during map change"
-set sv_vote_debug 0 "count votes by bots too for debugging purposes (to get a bot to vote exec this command: bot_cmd 1 cc vote yes)
+set sv_vote_debug 0 "count votes by bots too for debugging purposes (to get a bot to vote exec this command: bot_cmd 1 cc vote yes)"
 // when disabled, don't allow game type changes "note: set these two equal to JUST support simple majorities"
 set sv_vote_override_mostrecent 0