Merge branch 'master' into fruitiex/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / Main.qc

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index b1e418215c9b86278bc4803615ec7219c720e5b0..de74def1816f6f319e2f98f144c03b52280845ad 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -60,6 +60,10 @@ void CSQC_Init(void)
        
        check_unacceptable_compiler_bugs();
 
+#ifdef WATERMARK
+       print("^4CSQC Build information: ", WATERMARK(), "\n");
+#endif
+
        float i;
        CSQC_CheckEngine();
 
@@ -518,7 +522,6 @@ void GameCommand(string msg)
        {
                print("Usage: cl_cmd COMMAND..., where possible commands are:\n");
                print("  settemp cvar value\n");
-               print("  radar\n");
                print("  hud_columns_set ...\n");
                print("  hud_columns_help\n");
                GameCommand_Generic("help");
@@ -536,9 +539,6 @@ void GameCommand(string msg)
        else if(cmd == "settemp") {
                cvar_clientsettemp(argv(1), argv(2));
        }
-       else if(cmd == "radar") {
-               ons_showmap = !ons_showmap;
-       }
        else if(cmd == "hud_columns_set") {
                Cmd_HUD_SetFields(argc);
        }
@@ -598,15 +598,15 @@ void GameCommand(string msg)
        }
        else if(cmd == "sendcvar") {
                // W_FixWeaponOrder will trash argv, so save what we need.
-               string cvar;
-               cvar = strzone(argv(1));
-               s = cvar_string(cvar);
-               if(cvar == "cl_weaponpriority")
+               string thiscvar;
+               thiscvar = strzone(argv(1));
+               s = cvar_string(thiscvar);
+               if(thiscvar == "cl_weaponpriority")
                        s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 1);
-               else if(substring(cvar, 0, 17) == "cl_weaponpriority" && strlen(cvar) == 18)
+               else if(substring(thiscvar, 0, 17) == "cl_weaponpriority" && strlen(thiscvar) == 18)
                        s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 0);
-               localcmd("cmd sentcvar ", cvar, " \"", s, "\"\n");
-               strunzone(cvar);
+               localcmd("cmd sentcvar ", thiscvar, " \"", s, "\"\n");
+               strunzone(thiscvar);
        }
        else if(cmd == "spawn") {
                s = argv(1);