Split up the common commands in commands.cfg

diff --git a/commands.cfg b/commands.cfg
index 329353e6bce9a2f289c4117f3f50de1d3a7fc564..e5fc8b99924f68206acee2456e006aa80f3d37cf 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -16,19 +16,27 @@ alias if_dedicated "${* asis}"
 _if_dedicated alias if_client ""
 if_client alias if_dedicated ""
 
+if_client alias cmd_prefix "cmd"
+if_dedicated alias cmd_prefix "sv_cmd"
+
 
 // ========
 //  common
 // ========
-if_client alias teamstatus "cmd teamstatus"
-if_dedicated alias teamstatus "sv_cmd teamstatus"
-
-if_client alias who "cmd who"
-if_dedicated alias who "sv_cmd who"
-alias w who
-
-if_client alias vote "cmd vote ${* ?}"
-if_dedicated alias vote "sv_cmd vote ${* ?}"
+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 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"
@@ -77,7 +85,7 @@ alias scoreboard_columns_set "cl_cmd hud scoreboard_columns_set ${* ?}"
 alias scoreboard_columns_help "cl_cmd hud scoreboard_columns_help ${* ?}"
 
 
-// =========================================================== // TODO: FIGURE OUT ANY CONFLICTS WITH NORMAL COMMANDS
+// ===========================================================
 //  cmd (client-to-server command) - server/clientcommands.qc
 // ===========================================================
 set sv_clientcommand_antispam_time 1 "Amount of seconds after a command before another command can be called again without being considered spam. (Use -1 for no antispam limit)"
@@ -88,16 +96,8 @@ seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they ar
 alias autoswitch "cmd autoswitch ${* ?}"
 alias checkfail "cmd checkfail ${* ?}"
 alias clientversion "cmd clientversion ${* ?}"
-alias cvar_changes "cmd cvar_changes"
-alias cvar_purechanges "cmd cvar_purechanges"
 alias getmapvotepic "cmd getmapvotepic ${* ?}"
-alias info "cmd info ${* ?}"
 alias join "cmd join"
-alias ladder "cmd ladder"
-alias lsmaps "cmd lsmaps"
-alias lsnewmaps "cmd lsnewmaps"
-alias maplist "cmd maplist"
-alias rankings "cmd rankings"
 alias ready "cmd ready"
 alias records "cmd records"
 alias reportcvar "cmd reportcvar ${* ?}"
@@ -107,13 +107,9 @@ alias selectteam "cmd selectteam ${* ?}"
 alias sentcvar "cmd sentcvar ${* ?}"
 alias spectate "cmd spectate"
 alias suggestmap "cmd suggestmap ${* ?}"
-alias teamstatus "cmd teamstatus"
 //alias tell "cmd tell ${* ?}" // engine already has this declared as a command
-alias timein "cmd timein"
-alias timeout "cmd timeout"
 alias voice "cmd voice ${* ?}"
 alias vote "cmd vote ${* ?}"
-alias who "cmd who"
 
 // other aliases for client-to-server commands
 alias autoswitch "set cl_autoswitch ${1 ?} ; cmd autoswitch ${1 ?}" // todo
@@ -140,8 +136,6 @@ alias anticheat "sv_cmd anticheat ${* ?}"
 alias bbox "sv_cmd bbox"
 alias bot_cmd "sv_cmd bot_cmd ${* ?}"
 alias cointoss "sv_cmd cointoss ${* ?}"
-alias cvar_changes "sv_cmd cvar_changes"
-alias cvar_purechanges "sv_cmd cvar_purechanges"
 alias database "sv_cmd database ${* ?}"
 alias defer_clear "sv_cmd defer_clear ${* ?}"
 alias defer_clear_all "sv_cmd defer_clear_all"
@@ -152,7 +146,6 @@ alias find "sv_cmd find ${* ?}"
 alias gametype "sv_cmd gametype ${* ?}"
 alias gettaginfo "sv_cmd gettaginfo ${* ?}"
 alias gotomap "sv_cmd gotomap ${* ?}"
-alias ladder "sv_cmd ladder"
 alias lockteams "sv_cmd lockteams"
 alias make_mapinfo "sv_cmd make_mapinfo"
 alias modelbug "sv_cmd modelbug"
@@ -162,13 +155,10 @@ alias onslaught_updatelinks "sv_cmd onslaught_updatelinks"
 alias playerdemo "sv_cmd playerdemo ${* ?}"
 alias printstats "sv_cmd printstats"
 alias radarmap "sv_cmd radarmap ${* ?}"
-alias rankings "sv_cmd rankings"
-alias records "sv_cmd records"
 alias reducematchtime "sv_cmd reducematchtime"
 alias setbots "sv_cmd setbots ${* ?}"
 alias shuffleteams "sv_cmd shuffleteams"
 alias stuffto "sv_cmd stuffto ${* ?}"
-alias teamstatus "sv_cmd teamstatus"
 alias time "sv_cmd time"
 alias trace "sv_cmd trace ${* ?}"
 alias unlockteams "sv_cmd unlockteams"