Update commands.cfg with new command listing from the new command I added (dumpcomman...

diff --git a/commands.cfg b/commands.cfg
index d7de5caf11d17197bb42b8b6b7baa91483c060ef..fa73f413fb37310d7e99ca599863c19c5cba4dc3 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -11,9 +11,9 @@ alias if_dedicated "${* asis}"
 _if_dedicated alias if_client ""
 if_client alias if_dedicated ""
 
-if_client set cmd_prefix "cmd"
-if_dedicated set cmd_prefix "sv_cmd"
-
+if_dedicated "alias" qc_cmd_sv     "sv_cmd $$*"
+if_client    "alias" qc_cmd_cl     "cl_cmd $$*"
+if_client    "alias" qc_cmd_cmd    "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 $$*"
@@ -25,22 +25,32 @@ if_client    "alias" qc_cmd_svcmd  "cmd $$*"
 // ========
 //  common
 // ========
-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 ${* ?}"
-
+// networked/server common commands
+alias cvar_changes         "qc_cmd_svcmd  cvar_changes         ${* ?}" // Prints a list of all changed server cvars
+alias cvar_purechanges     "qc_cmd_svcmd  cvar_purechanges     ${* ?}" // Prints a list of all changed gameplay cvars
+alias info                 "qc_cmd_svcmd  info                 ${* ?}" // Request for unique server information set up by admin
+alias ladder               "qc_cmd_svcmd  ladder               ${* ?}" // Get information about top players if supported
+alias lsmaps               "qc_cmd_svcmd  lsmaps               ${* ?}" // List maps which can be used with the current game mode
+alias lsnewmaps            "qc_cmd_svcmd  lsnewmaps            ${* ?}" // List maps which have no records or are seemingly unplayed yet
+alias maplist              "qc_cmd_svcmd  maplist              ${* ?}" // Display full server maplist reply
+alias rankings             "qc_cmd_svcmd  rankings             ${* ?}" // Print information about rankings
+alias records              "qc_cmd_svcmd  records              ${* ?}" // List top 10 records for the current map
+alias teamstatus           "qc_cmd_svcmd  teamstatus           ${* ?}" // Show information about player and team scores
+alias time                 "qc_cmd_svcmd  time                 ${* ?}" // Print different formats/readouts of time
+alias timein               "qc_cmd_svcmd  timein               ${* ?}" // Resume the game from being paused with a timeout
+alias timeout              "qc_cmd_svcmd  timeout              ${* ?}" // Call a timeout which pauses the game for certain amount of time unless unpaused
+alias vote                 "qc_cmd_svcmd  vote                 ${* ?}" // Request an action to be voted upon by players
+alias who                  "qc_cmd_svcmd  who                  ${* ?}" // Display detailed client information about all players
+
+// generic commands (across all programs)
+alias addtolist            "qc_cmd_svmenu addtolist            ${* ?}" // Add a string to a cvar at the end of a list
+alias dumpcommands         "qc_cmd_svmenu dumpcommands         ${* ?}" // Dump all commands on the program to *_cmd_dump.txt
+alias maplist              "qc_cmd_svmenu maplist              ${* ?}" // Automatic control of maplist
+alias rpn                  "qc_cmd_svmenu rpn                  ${* ?}" // RPN calculator
+//alias settemp            "qc_cmd_svmenu settemp              ${* ?}" // Temporarily set a value to a cvar which is restored later
+//alias settemp_restore    "qc_cmd_svmenu settemp_restore      ${* ?}" // Restore all cvars set by settemp command
+
+// other aliases for common commands
 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"
 
@@ -87,22 +97,20 @@ alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_
 //  cl_cmd (client local command) - client/command/cl_cmd.qc
 // ==========================================================
 // commented out commands are really only intended for internal use
-if_client alias blurtest "cl_cmd blurtest"
-if_client alias debugmodel "cl_cmd debugmodel ${* ?}"
-//if_client alias handlevote "cl_cmd handlevote ${* ?}"
-if_client alias hud "cl_cmd hud ${* ?}"
-if_client alias localprint "cl_cmd localprint ${* ?}"
-//if_client alias mv_download "cl_cmd mv_download ${* ?}"
-if_client alias sendcvar "cl_cmd sendcvar ${* ?}"
-//if_client alias settemp "cl_cmd settemp ${* ?}"
-//if_client alias settemp_restore "cl_cmd settemp_restore"
+alias blurtest             "qc_cmd_cl     blurtest             ${* ?}" // Feature for testing blur postprocessing
+alias debugmodel           "qc_cmd_cl     debugmodel           ${* ?}" // Spawn a debug model manually
+//alias handlevote         "qc_cmd_cl     handlevote           ${* ?}" // System to handle selecting a vote or option
+alias hud                  "qc_cmd_cl     hud                  ${* ?}" // Commands regarding/controlling the HUD system
+alias localprint           "qc_cmd_cl     localprint           ${* ?}" // Create your own centerprint sent to yourself
+//alias mv_download        "qc_cmd_cl     mv_download          ${* ?}" // Retrieve mapshot picture from the server
+alias sendcvar             "qc_cmd_cl     sendcvar             ${* ?}" // Send a cvar to the server (like weaponpriority)
 
 // other aliases for local commands
-if_client alias hud_configure "cl_cmd hud configure"
-if_client alias hud_save "cl_cmd hud save ${* ?}"
-if_client alias radar "cl_cmd hud radar ${* ?}"
-if_client alias scoreboard_columns_help "cl_cmd hud scoreboard_columns_help"
-if_client alias scoreboard_columns_set "cl_cmd hud scoreboard_columns_set ${* ?}"
+alias hud_configure "qc_cmd_cl hud configure"
+alias hud_save "qc_cmd_cl hud save ${* ?}"
+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 ${* ?}"
 
 // changes a cvar and reports it to the server (for the client to notify the server about changes)
 alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
@@ -117,22 +125,22 @@ seta sv_status_privacy 1 "hide IP addresses from \"status\" and \"who\" replies
 seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they are better than what you are carrying"
 
 // commented out commands are really only intended for internal use, or already have declaration in the engine
-alias autoswitch "cmd autoswitch ${* ?}"
-alias checkfail "cmd checkfail ${* ?}"
-alias clientversion "cmd clientversion ${* ?}"
-//alias getmapvotepic "cmd getmapvotepic ${* ?}"
-alias join "cmd join"
-alias ready "cmd ready"
-alias records "cmd records"
-alias reportcvar "cmd reportcvar ${* ?}"
-//alias say "cmd say ${* ?}" // engine already has this declared as a command
-//alias say_team "cmd say_team ${* ?}" // engine already has this declared as a command
-alias selectteam "cmd selectteam ${* ?}"
-alias sentcvar "cmd sentcvar ${* ?}"
-alias spectate "cmd spectate"
-alias suggestmap "cmd suggestmap ${* ?}"
-//alias tell "cmd tell ${* ?}" // engine already has this declared as a command
-alias voice "cmd voice ${* ?}"
+alias autoswitch           "qc_cmd_cmd    autoswitch           ${* ?}" // Whether or not to switch automatically when getting a better weapon
+alias checkfail            "qc_cmd_cmd    checkfail            ${* ?}" // Report if a client-side check failed
+alias clientversion        "qc_cmd_cmd    clientversion        ${* ?}" // Release version of the game
+//alias getmapvotepic      "qc_cmd_cmd    getmapvotepic        ${* ?}" // Retrieve mapshot picture from the server
+alias join                 "qc_cmd_cmd    join                 ${* ?}" // Become a player in the game
+alias ready                "qc_cmd_cmd    ready                ${* ?}" // Qualify as ready to end warmup stage (or restart server if allowed)
+alias reportcvar           "qc_cmd_cmd    reportcvar           ${* ?}" // Old system for sending a client cvar to the server
+//alias say                "qc_cmd_cmd    say                  ${* ?}" // Print a message to chat to all players
+//alias say_team           "qc_cmd_cmd    say_team             ${* ?}" // Print a message to chat to all team mates
+alias selectteam           "qc_cmd_cmd    selectteam           ${* ?}" // Attempt to choose a team to join into
+alias selfstuff            "qc_cmd_cmd    selfstuff            ${* ?}" // Stuffcmd a command to your own client
+alias sentcvar             "qc_cmd_cmd    sentcvar             ${* ?}" // New system for sending a client cvar to the server
+alias spectate             "qc_cmd_cmd    spectate             ${* ?}" // Become an observer
+alias suggestmap           "qc_cmd_cmd    suggestmap           ${* ?}" // Suggest a map to the mapvote at match end
+//alias tell               "qc_cmd_cmd    tell                 ${* ?}" // Send a message directly to a player
+alias voice                "qc_cmd_cmd    voice                ${* ?}" // Send voice message via sound
 
 // other aliases for client-to-server commands
 alias autoswitch "set cl_autoswitch ${1 ?} ; cmd autoswitch ${1 ?}" // todo
@@ -152,39 +160,37 @@ alias sandbox "cmd g_sandbox ${* ?}"
 // ============================================================
 //  sv_cmd (server console command) - server/command/sv_cmd.qc
 // ============================================================
-alias adminmsg "sv_cmd adminmsg ${* ?}"
-alias allready "sv_cmd allready"
-alias allspec "sv_cmd allspec ${* ?}"
-alias anticheat "sv_cmd anticheat ${* ?}"
-alias bbox "sv_cmd bbox"
-alias bot_cmd "sv_cmd bot_cmd ${* ?}"
-alias cointoss "sv_cmd cointoss ${* ?}"
-alias database "sv_cmd database ${* ?}"
-alias defer_clear "sv_cmd defer_clear ${* ?}"
-alias defer_clear_all "sv_cmd defer_clear_all"
-alias delrec "sv_cmd delrec ${* ?}"
-alias effectindexdump "sv_cmd effectindexdump"
-alias extendmatchtime "sv_cmd extendmatchtime"
-alias find "sv_cmd find ${* ?}"
-alias gametype "sv_cmd gametype ${* ?}"
-alias gettaginfo "sv_cmd gettaginfo ${* ?}"
-alias gotomap "sv_cmd gotomap ${* ?}"
-alias lockteams "sv_cmd lockteams"
-alias make_mapinfo "sv_cmd make_mapinfo"
-alias modelbug "sv_cmd modelbug"
-alias moveplayer "sv_cmd moveplayer ${* ?}"
-alias nospectators "sv_cmd nospectators"
-alias onslaught_updatelinks "sv_cmd onslaught_updatelinks"
-alias playerdemo "sv_cmd playerdemo ${* ?}"
-alias printstats "sv_cmd printstats"
-alias radarmap "sv_cmd radarmap ${* ?}"
-alias reducematchtime "sv_cmd reducematchtime"
-alias setbots "sv_cmd setbots ${* ?}"
-alias shuffleteams "sv_cmd shuffleteams"
-alias stuffto "sv_cmd stuffto ${* ?}"
-alias trace "sv_cmd trace ${* ?}"
-alias unlockteams "sv_cmd unlockteams"
-alias warp "sv_cmd warp ${* ?}"
+alias adminmsg             "qc_cmd_sv     adminmsg             ${* ?}" // Send an admin message to a client directly
+alias allready             "qc_cmd_sv     allready             ${* ?}" // Restart the server and reset the players
+alias allspec              "qc_cmd_sv     allspec              ${* ?}" // Force all players to spectate
+alias anticheat            "qc_cmd_sv     anticheat            ${* ?}" // Create an anticheat report for a client
+alias bbox                 "qc_cmd_sv     bbox                 ${* ?}" // Print detailed information about world size
+alias bot_cmd              "qc_cmd_sv     bot_cmd              ${* ?}" // Control and send commands to bots
+alias cointoss             "qc_cmd_sv     cointoss             ${* ?}" // Flip a virtual coin and give random result
+alias database             "qc_cmd_sv     database             ${* ?}" // Extra controls of the serverprogs database
+alias defer_clear          "qc_cmd_sv     defer_clear          ${* ?}" // Clear all queued defer commands for a specific client
+alias defer_clear_all      "qc_cmd_sv     defer_clear_all      ${* ?}" // Clear all queued defer commands for all clients
+alias delrec               "qc_cmd_sv     delrec               ${* ?}" // Delete race time record for a map
+alias effectindexdump      "qc_cmd_sv     effectindexdump      ${* ?}" // Dump list of effects from code and effectinfo.txt
+alias extendmatchtime      "qc_cmd_sv     extendmatchtime      ${* ?}" // Increase the timelimit value incrementally
+alias find                 "qc_cmd_sv     find                 ${* ?}" // Search through entities for matching classname
+alias gametype             "qc_cmd_sv     gametype             ${* ?}" // Simple command to change the active gametype
+alias gettaginfo           "qc_cmd_sv     gettaginfo           ${* ?}" // Get specific information about a weapon model
+alias gotomap              "qc_cmd_sv     gotomap              ${* ?}" // Simple command to switch to another map
+alias lockteams            "qc_cmd_sv     lockteams            ${* ?}" // Disable the ability for players to switch or enter teams
+alias make_mapinfo         "qc_cmd_sv     make_mapinfo         ${* ?}" // Automatically rebuild mapinfo files
+alias moveplayer           "qc_cmd_sv     moveplayer           ${* ?}" // Change the team/status of a player
+alias nospectators         "qc_cmd_sv     nospectators         ${* ?}" // Automatically remove spectators from a match
+alias playerdemo           "qc_cmd_sv     playerdemo           ${* ?}" // Control the ability to save demos of players
+alias printstats           "qc_cmd_sv     printstats           ${* ?}" // Dump eventlog player stats and other score information
+alias radarmap             "qc_cmd_sv     radarmap             ${* ?}" // Generate a radar image of the map
+alias reducematchtime      "qc_cmd_sv     reducematchtime      ${* ?}" // Decrease the timelimit value incrementally
+alias setbots              "qc_cmd_sv     setbots              ${* ?}" // Adjust how many bots are in the match
+alias shuffleteams         "qc_cmd_sv     shuffleteams         ${* ?}" // Randomly move players to different teams
+alias stuffto              "qc_cmd_sv     stuffto              ${* ?}" // Send a command to be executed on a client
+alias trace                "qc_cmd_sv     trace                ${* ?}" // Various debugging tools with tracing
+alias unlockteams          "qc_cmd_sv     unlockteams          ${* ?}" // Enable the ability for players to switch or enter teams
+alias warp                 "qc_cmd_sv     warp                 ${* ?}" // Choose different level in campaign
 
 // other aliases for server commands
 alias endmatch "timelimit -1"

diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index f16de6ea3ccb06147d175a596cdac354b2a9d505..465eaaac062f9236847f5a3fef341b834c67f785 100644 (file)
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -345,7 +345,7 @@ float LocalCommand_macro_usage(float argc)
 void LocalCommand_macro_write_aliases(float fh)
 {
        #define CLIENT_COMMAND(name,function,description) \
-               { CMD_Write_Alias("cl_cmd", name, description); }
+               { CMD_Write_Alias("qc_cmd_cl", name, description); }
                
        CLIENT_COMMANDS(0, 0)
        #undef CLIENT_COMMAND

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 19be426d5363937c86882d78c25e65845eefcec4..27cc226bf588e871248220487b357dc5d8ed51d6 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -601,7 +601,7 @@ float ClientCommand_macro_usage(float argc)
 void ClientCommand_macro_write_aliases(float fh)
 {
        #define CLIENT_COMMAND(name,function,description) \
-               { CMD_Write_Alias("cmd", name, description); } 
+               { CMD_Write_Alias("qc_cmd_cmd", name, description); } 
                
        CLIENT_COMMANDS(0, 0, "")
        #undef CLIENT_COMMAND
@@ -640,10 +640,10 @@ void SV_ParseClientCommand(string command)
                        if(SV_ParseClientCommand_floodcheck())
                                break; // "TRUE": continue, as we're not flooding yet
                        else
-                               return print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n"); // "FALSE": not allowed to continue, halt
+                               return print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n"); // "FALSE": not allowed to continue, halt TODO
        }
        
-       /* NOTE: totally disabled for now for bandwidth/security reasons, however the functionality and descriptions are there if we ever want it. */
+       /* NOTE: should this be disabled? It can be spammy perhaps, but hopefully it's okay for now */
        if(argv(0) == "help") 
        {
                if(argc == 1) 

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 9f0dcdd1ef378fd2f3112dde092bad26d6d14379..253d1c310af38e1f2801dec30662a955a80152e4 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1715,7 +1715,7 @@ float GameCommand_macro_usage(float argc)
 void GameCommand_macro_write_aliases(float fh)
 {
        #define SERVER_COMMAND(name,function,description) \
-               { CMD_Write_Alias("sv_cmd", name, description); }
+               { CMD_Write_Alias("qc_cmd_sv", name, description); }
                
        SERVER_COMMANDS(0, 0, "")
        #undef SERVER_COMMAND