Fix cvar getting

You can now get the cvar value by typing the variable names, as
originally intended.

Also, setting the cvar now works for the abnormal spacing of `key =value`.

Author: qaisjp

Client/core/CClientVariables.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
-*  PROJECT:     Multi Theft Auto v1.0
+*  PROJECT:     Multi Theft Auto
 *  LICENSE:     See LICENSE in the top level directory
 *  FILE:        core/CClientVariables.h
 *  PURPOSE:     Header file for client variable class
@@ -11,8 +11,7 @@
 *
 *****************************************************************************/
 
-#ifndef __CCLIENTVARIABLES_H
-#define __CCLIENTVARIABLES_H
+#pragma once
 
 #include <string>
 #include "CSingleton.h"
@@ -78,5 +77,3 @@ class CClientVariables : public CCVarsInterface, public CSingleton < CClientVari
     CXMLNode        *m_pStorage;
     int             m_iRevision;
 };
-
-#endif

Client/core/CCommands.cpp

@@ -145,30 +145,42 @@ bool CCommands::Execute ( const char* szCommand, const char* szParametersIn, boo
         }
     }
 
+    // Recompose the original command text
+    std::string val = std::string (szCommand) + " " + std::string (szParameters ? szParameters : "");
+
     // Is it a cvar? (syntax: cvar[ = value])
-    std::string val = std::string ( szCommand ) + " " + std::string ( szParameters ? szParameters : "" );
-    unsigned int nOpIndex = val.find ( '=' );
-    std::string key = val.substr ( 0, nOpIndex );
-    if (val.find(" = ") != std::string::npos) {
-        key = val.substr ( 0, nOpIndex-1 );
-    }
-    if ( CClientVariables::GetSingleton ().Exists ( key ) && !bIsScriptedBind ) {
-        std::stringstream ss;
-
-        // Determine whether this is an atomic get or set query
-        if ( nOpIndex != std::string::npos ) {
-            // (set) some_cvar=value
-            val = val.substr ( nOpIndex + 1 );
-            TrimWhiteSpace ( val );
-            CVARS_SET ( key, val );
-        } else {
-            // (get) some_cvar
-            CVARS_GET ( key, val );
+    {
+        // Check to see if '=' exists
+        unsigned int nOpIndex = val.find ('=');
+        std::string key = val.substr (0, nOpIndex);
+
+        // Check to see if ' =' exists
+        if (val.find (" =") != std::string::npos) {
+            key = val.substr (0, nOpIndex - 1);
+        }
+
+        TrimWhiteSpace (key);
+
+        // Handle the cvar if it exists
+        if (CClientVariables::GetSingleton ().Exists (key) && !bIsScriptedBind) {
+            std::stringstream ss;
+
+            // Determine whether this is an atomic get or set query
+            if (nOpIndex != std::string::npos) {
+                // (set) some_cvar=value
+                val = val.substr (nOpIndex + 1);
+                TrimWhiteSpace (val);
+                CVARS_SET (key, val);
+            }
+            else {
+                // (get) some_cvar
+                CVARS_GET (key, val);
+            }
+            ss << key << " = " << val;
+            val = ss.str ();
+            CCore::GetSingleton ().GetConsole ()->Print (val.c_str ());
+            return true;
         }
-        ss << key << " = " << val;
-        val = ss.str ();
-        CCore::GetSingleton ().GetConsole ()->Print ( val.c_str () );
-        return true;
     }
 
     // HACK: if its a 'nick' command, save it here