Merge branch 'master' into mirceakitsune/sandbox

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

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index 92336234a0fedccc44934b688c77bf17bbdbef19..3deddf80164c92ceb6269ea35f78e5a538d17fd9 100644 (file)
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -159,17 +159,11 @@ void SV_ParseClientCommand(string s) {
        if(cmd_name != "begin")
        {
                if(cmd_floodcheck())
-               {
-                       cmd_string = cmd_name = string_null; // unreference tempstrings
                        return;
-               }
        }
 
-       if(MUTATOR_CALLHOOK(SV_ParseClientCommand)) {
-               cmd_string = cmd_name = string_null; // unreference tempstrings
+       if(MUTATOR_CALLHOOK(SV_ParseClientCommand))
                return; // already handled
-       }
-       cmd_string = cmd_name = string_null; // unreference tempstrings
        
        if(GameCommand_Vote(s, self)) {
                return;
@@ -375,7 +369,7 @@ void SV_ParseClientCommand(string s) {
                }
                //clientcommand(self, formatmessage(s));
        } else if(cmd_name == "info") {
-               cmd_name = cvar_string_builtin(strcat("sv_info_", argv(1))); // This needed fixed for the cvar check
+               cmd_name = builtin_cvar_string(strcat("sv_info_", argv(1))); // This needed fixed for the cvar check
                if(cmd_name == "")
                        sprint(self, "ERROR: unsupported info command\n");
                else