Add 'muteban' alias for 'mute' command and indent code block in BAN_COMMAND for bette...

diff --git a/commands.cfg b/commands.cfg
index 5d4a7271ee0e9ff3902e1dbac5cb292fb4352c62..9e885a2692eb5db78bc5f07b63766e87258ef32a 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -269,14 +269,16 @@ alias settemp_restore "qc_cmd_svcl settemp_restore"
 
 
 // ===================================
-//  banning - server/command/ipban.qc
+//  banning - server/ipban.qc
 // ===================================
 alias ban                  "qc_cmd_sv     ban                  ${* ?}" // Ban an IP address or a range of addresses (like 1.2.3)
 alias banlist              "qc_cmd_sv     banlist              ${* ?}" // List all existing bans
 alias kickban              "qc_cmd_sv     kickban              ${* ?}" // Disconnect a client and ban it at the same time
 alias mute                 "qc_cmd_sv     mute                 ${* ?}" // Disallow a client from talking by muting them
+alias muteban              "qc_cmd_sv     mute                 ${* ?}" // Alternative version of "mute", disallow a client from talking by muting them
 alias unban                "qc_cmd_sv     unban                ${* ?}" // Remove an existing ban
 alias unmute               "qc_cmd_sv     unmute               ${* ?}" // Unmute a client (Remove an existing muting ban)
+alias unmuteban            "qc_cmd_sv     unmute               ${* ?}" // Alternative version of "unmute", unmute a client (Remove an existing muting ban)
 
 // other aliases for ban commands
 alias bans "banlist"

diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc
index 52c7e9c431d9ce75872fb8695d28a85636b8675d..933eb3c83d8e85fc59ebb825136aa0e641d968cf 100644 (file)
--- a/qcsrc/server/command/banning.qc
+++ b/qcsrc/server/command/banning.qc
@@ -462,16 +462,16 @@ void BanCommand_(int request)
 
 // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
 #define BAN_COMMANDS(request, arguments, command) \
-       BAN_COMMAND("ban", BanCommand_ban(request, arguments, command), "Ban an IP address or a range of addresses (like 1.2.3)") \
-       BAN_COMMAND("banlist", BanCommand_banlist(request), "List all existing bans") \
-       BAN_COMMAND("kickban", BanCommand_kickban(request, arguments, command), "Disconnect a client and ban it at the same time") \
-       BAN_COMMAND("mute", BanCommand_mute(request, arguments, command), "Disallow a client from talking by muting them") \
-       BAN_COMMAND("playban", BanCommand_playban(request, arguments, command), "Force to spectate a client permanently") \
-       BAN_COMMAND("unban", BanCommand_unban(request, arguments), "Remove an existing ban") \
-       BAN_COMMAND("unmute", BanCommand_unmute(request, arguments), "Unmute a client") \
-       BAN_COMMAND("unvoteban", BanCommand_unvoteban(request, arguments), "Remove an existing voting ban") \
-       BAN_COMMAND("unplayban", BanCommand_unplayban(request, arguments), "Remove an existing forced to spectate ban") \
-       BAN_COMMAND("voteban", BanCommand_voteban(request, arguments, command), "Disallow a client from voting") \
+       BAN_COMMAND("ban",          BanCommand_ban(request, arguments, command),        "Ban an IP address or a range of addresses (like 1.2.3)") \
+       BAN_COMMAND("banlist",      BanCommand_banlist(request),                        "List all existing bans") \
+       BAN_COMMAND("kickban",      BanCommand_kickban(request, arguments, command),    "Disconnect a client and ban it at the same time") \
+       BAN_COMMAND("mute",         BanCommand_mute(request, arguments, command),       "Disallow a client from talking by muting them") \
+       BAN_COMMAND("playban",      BanCommand_playban(request, arguments, command),    "Force to spectate a client permanently") \
+       BAN_COMMAND("unban",        BanCommand_unban(request, arguments),               "Remove an existing ban") \
+       BAN_COMMAND("unmute",       BanCommand_unmute(request, arguments),              "Unmute a client") \
+       BAN_COMMAND("unvoteban",    BanCommand_unvoteban(request, arguments),           "Remove an existing voting ban") \
+       BAN_COMMAND("unplayban",    BanCommand_unplayban(request, arguments),           "Remove an existing forced to spectate ban") \
+       BAN_COMMAND("voteban",      BanCommand_voteban(request, arguments, command),    "Disallow a client from voting") \
        /* nothing */
 
 void BanCommand_macro_help()