Merge remote branch 'origin/master' into samual/updatecommands

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

diff --git a/commands.cfg b/commands.cfg
index 22acccd88f9580f52b93c54579b7805bd664d1b3..754b0b382b311f5361d99119488cd3cd5c23652e 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -2,11 +2,6 @@
 //  Master config for managing various command aliases and settings
 // =================================================================
 
-// This alias allows for common commands to be executed, even on both
-// dedicated servers and normal clients. If dedicated, then it remains
-// as sv_cmd... If a normal client, then it is changed to menu_cmd.
-alias qc_cmd "sv_cmd $*" 
-
 // Execute commands based on whether it is dedicated a server or a client.
 alias "_detect_dedicated_$qport" "${* asis}"
 alias "_detect_dedicated_0" ""
@@ -19,37 +14,44 @@ if_client alias if_dedicated ""
 if_client set cmd_prefix "cmd"
 if_dedicated set cmd_prefix "sv_cmd"
 
+if_dedicated "alias" qc_cmd_svmenu "sv_cmd $$*"
+if_client    "alias" qc_cmd_svmenu "menu_cmd $$*"
+if_dedicated "alias" qc_cmd_svcl   "sv_cmd $$*"
+if_client    "alias" qc_cmd_svcl   "cl_cmd $$*"
+if_dedicated "alias" qc_cmd_svcmd  "sv_cmd $$*"
+if_client    "alias" qc_cmd_svcmd  "cmd $$*"
+
 
 // ========
 //  common
 // ========
-alias cvar_changes "${cmd_prefix !} cvar_changes"
-alias cvar_purechanges "${cmd_prefix !} cvar_purechanges"
-alias info "${cmd_prefix !} info ${* ?}"
-alias ladder "${cmd_prefix !} ladder"
-alias lsmaps "${cmd_prefix !} lsmaps"
-alias lsnewmaps "${cmd_prefix !} lsnewmaps"
-alias maplist "${cmd_prefix !} maplist"
-alias rankings "${cmd_prefix !} rankings"
-alias records "${cmd_prefix !} records"
-alias teamstatus "${cmd_prefix !} teamstatus"
-alias time "${cmd_prefix !} time"
-alias timein "${cmd_prefix !} timein"
-alias timeout "${cmd_prefix !} timeout"
-alias vote "${cmd_prefix !} vote ${* ?}"
-alias who "${cmd_prefix !} who ${* ?}"
-
-alias g_hitplots_add "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals ${1 !} union def"
-alias g_hitplots_remove "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals ${1 !} difference def"
-
-alias g_maplist_add    "qc_cmd maplist add ${* ?}"
-alias g_maplist_remove "qc_cmd maplist remove ${* ?}"
-alias g_maplist_putfirst       "qc_cmd maplist remove ${* ?} ; qc_cmd maplist add ${* ?}"
-alias g_maplist_shufflenow     "qc_cmd maplist shuffle"
-alias g_maplist_cleanup        "qc_cmd maplist cleanup" // removes maps that don't exist from the map list
-
-alias addfav "qc_cmd addtolist net_slist_favorites ${* ?}"
-alias addvote "qc_cmd addtolist sv_vote_commands ${* ?}"
+alias cvar_changes "qc_cmd_svcmd cvar_changes"
+alias cvar_purechanges "qc_cmd_svcmd cvar_purechanges"
+alias info "qc_cmd_svcmd info ${* ?}"
+alias ladder "qc_cmd_svcmd ladder"
+alias lsmaps "qc_cmd_svcmd lsmaps"
+alias lsnewmaps "qc_cmd_svcmd lsnewmaps"
+alias maplist "qc_cmd_svcmd maplist"
+alias rankings "qc_cmd_svcmd rankings"
+alias records "qc_cmd_svcmd records"
+alias teamstatus "qc_cmd_svcmd teamstatus"
+alias time "qc_cmd_svcmd time"
+alias timein "qc_cmd_svcmd timein"
+alias timeout "qc_cmd_svcmd timeout"
+alias vote "qc_cmd_svcmd vote ${* ?}"
+alias who "qc_cmd_svcmd who ${* ?}"
+
+alias g_hitplots_add "qc_cmd_svmenu rpn /g_hitplots_individuals g_hitplots_individuals ${1 !} union def"
+alias g_hitplots_remove "qc_cmd_svmenu rpn /g_hitplots_individuals g_hitplots_individuals ${1 !} difference def"
+
+alias g_maplist_add    "qc_cmd_svmenu maplist add ${* ?}"
+alias g_maplist_remove "qc_cmd_svmenu maplist remove ${* ?}"
+alias g_maplist_putfirst       "qc_cmd_svmenu maplist remove ${* ?} ; qc_cmd maplist add ${* ?}"
+alias g_maplist_shufflenow     "qc_cmd_svmenu maplist shuffle"
+alias g_maplist_cleanup        "qc_cmd_svmenu maplist cleanup" // removes maps that don't exist from the map list
+
+alias addfav "qc_cmd_svmenu addtolist net_slist_favorites ${* ?}"
+alias addvote "qc_cmd_svmenu addtolist sv_vote_commands ${* ?}"
 
 
 // ========================
@@ -200,14 +202,8 @@ alias movetoauto "moveplayer ${1 ?} auto"
 //  Aliases for settemp subsystem. Warning: Do not touch. 
 //  Usage: settemp variable value, next map resets it.
 // =======================================================
-set settemp_list 0
-set settemp_idx 0
-set _settemp_var UNUSED
-alias settemp "_settemp_var \"_settemp_x$settemp_idx\"; qc_cmd rpn /settemp_idx settemp_idx 1 add def; _settemp \"$1\" \"$2\""
-alias _settemp "settemp_list \"1 $1 $_settemp_var $settemp_list\"; set $_settemp_var \"${$1}\"; $1 \"$2\""
-alias settemp_restore "_settemp_restore_${settemp_list asis}"
-alias _settemp_restore_0 "set settemp_var 0; set settemp_list 0"
-alias _settemp_restore_1 "$1 \"${$2}\"; _settemp_restore_${3- asis}"
+alias settemp "qc_cmd_svcl settemp $$*"
+alias settemp_restore "qc_cmd_svcl settemp_restore"
 
 
 // ===================================