properly report 0 free slots to server browser on restricted servers

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / cmd.qc

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index efdbe95e6c31d53a63aeac12354e6295f4050d88..8a086fcd5aaa43c9e82c8de7d7b562b85fb40f07 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -116,7 +116,7 @@ void ClientCommand_clientversion(float request, float argc) // internal command,
        }
 }
 
-void ClientCommand_getmapvotepic(float request, float argc) // internal command, used only by code
+void ClientCommand_mv_getpicture(float request, float argc) // internal command, used only by code
 {
        switch(request)
        {
@@ -132,17 +132,17 @@ void ClientCommand_getmapvotepic(float request, float argc) // internal command,
                }
                        
                default:
-                       sprint(self, "Incorrect parameters for ^2getmapvotepic^7\n");
+                       sprint(self, "Incorrect parameters for ^2mv_getpicture^7\n");
                case CMD_REQUEST_USAGE:
                {
-                       sprint(self, "\nUsage:^3 cmd getmapvotepic mapid\n");
+                       sprint(self, "\nUsage:^3 cmd mv_getpicture mapid\n");
                        sprint(self, "  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
                        return;
                }
        }
 }
 
-void ClientCommand_join(float request) // legacy
+void ClientCommand_join(float request) 
 {
        switch(request)
        {
@@ -152,7 +152,7 @@ void ClientCommand_join(float request) // legacy
                        {
                                if(self.classname != "player" && !lockteams && !g_arena)
                                {
-                                       if(nJoinAllowed(1)) 
+                                       if(nJoinAllowed(self)) 
                                        {
                                                if(g_ca) { self.caplayer = 1; }
                                                if(autocvar_g_campaign) { campaign_bots_may_start = 1; }
@@ -418,7 +418,7 @@ void ClientCommand_sentcvar(float request, float argc, string command)
        }
 }
 
-void ClientCommand_spectate(float request) // legacy
+void ClientCommand_spectate(float request) 
 {
        switch(request)
        {
@@ -510,9 +510,9 @@ void ClientCommand_tell(float request, float argc, string command)
                                        }
                                        else { print_to(self, "You can't ^2tell^7 a message to yourself."); return; }
                                }
-                               else if(strtolower(argv(1)) == "world") 
+                               else if(argv(1) == "#0") 
                                { 
-                                       trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)));
+                                       trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(next_token), argv_end_index(-1) - argv_start_index(next_token)));
                                        return;
                                }
                                else { print_to(self, strcat("tell: ", GetClientErrorString(tell_accepted, argv(1)), ".")); return; }
@@ -530,7 +530,7 @@ void ClientCommand_tell(float request, float argc, string command)
        }
 }
 
-void ClientCommand_voice(float request, float argc, string command) // legacy
+void ClientCommand_voice(float request, float argc, string command) 
 {
        switch(request)
        {
@@ -592,7 +592,7 @@ void ClientCommand_(float request)
        CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(request, arguments), "Whether or not to switch automatically when getting a better weapon") \
        CLIENT_COMMAND("checkfail", ClientCommand_checkfail(request, command), "Report if a client-side check failed") \
        CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \
-       CLIENT_COMMAND("getmapvotepic", ClientCommand_getmapvotepic(request, arguments), "Retrieve mapshot picture from the server") \
+       CLIENT_COMMAND("mv_getpicture", ClientCommand_mv_getpicture(request, arguments), "Retrieve mapshot picture from the server") \
        CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \
        CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \
        CLIENT_COMMAND("reportcvar", ClientCommand_reportcvar(request, arguments, command), "Old system for sending a client cvar to the server") \
@@ -660,6 +660,11 @@ void SV_ParseClientCommand(string command)
 {
        float argc = tokenize_console(command);
        
+       // for the mutator hook system
+       cmd_name = strtolower(argv(0));
+       cmd_argc = argc;
+       cmd_string = command;
+       
        // Guide for working with argc arguments by example:
        // argc:   1    - 2      - 3     - 4
        // argv:   0    - 1      - 2     - 3 
@@ -671,7 +676,7 @@ void SV_ParseClientCommand(string command)
                // exempt commands which are not subject to floodcheck
                case "begin": break; // handled by engine in host_cmd.c
                case "download": break; // handled by engine in cl_parse.c
-               case "getmapvotepic": break; // handled by server in this file
+               case "mv_getpicture": break; // handled by server in this file
                case "pause": break; // handled by engine in host_cmd.c
                case "prespawn": break; // handled by engine in host_cmd.c
                case "reportcvar": break; // handled by server in this file
@@ -682,7 +687,7 @@ 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 TODO
+                               return; // "FALSE": not allowed to continue, halt // print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n");
        }
        
        /* NOTE: should this be disabled? It can be spammy perhaps, but hopefully it's okay for now */
@@ -727,4 +732,4 @@ void SV_ParseClientCommand(string command)
        }
        else
                clientcommand(self, command);
-}
\ No newline at end of file
+}