Revert the cvar alias system, as a checkpoint pending an overhaul

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 4f13c0a9f578bcdb7f92623cbba3e3d136ad892d..1c5c4fb44d7de526f63f839d3165c60a1d7afad4 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -397,6 +397,8 @@ void Cbuf_Frame(cmd_state_t *cmd)
 ==============================================================================
 */
 
+extern qboolean host_init;
+
 /*
 ===============
 Cmd_StuffCmds_f
@@ -413,6 +415,10 @@ static void Cmd_StuffCmds_f (cmd_state_t *cmd)
        // this is for all commandline options combined (and is bounds checked)
        char    build[MAX_INPUTLINE];
 
+       // come back later so we don't crash
+       if(host_init)
+               return;
+
        if (Cmd_Argc (cmd) != 1)
        {
                Con_Print("stuffcmds : execute command line parameters\n");
@@ -2019,8 +2025,6 @@ A complete command line has been parsed, so try to execute it
 FIXME: lookupnoadd the token to speed search?
 ============
 */
-extern hook_t *csqc_concmd;
-
 void Cmd_ExecuteString (cmd_state_t *cmd, const char *text, cmd_source_t src, qboolean lockmutex)
 {
        int oldpos;
@@ -2042,7 +2046,7 @@ void Cmd_ExecuteString (cmd_state_t *cmd, const char *text, cmd_source_t src, qb
        {
                if (!strcasecmp(cmd->argv[0], func->name))
                {
-                       if (func->csqcfunc && Hook_Call(csqc_concmd, text)->bval)       //[515]: csqc
+                       if (func->csqcfunc && CL_VM_ConsoleCommand(text))       //[515]: csqc
                                goto done;
                        break;
                }