Refactored lightmap update handling and added cvars to replace gl_nopartialtextureupd...

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index eca5bf3d2bbf788e3ec7cd85eea0751f56c6d6ea..722d1477ad9e1f03ad1ba0b6993b7a61e03ea743 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -88,21 +88,21 @@ static void Cmd_Defer_f (cmd_state_t *cmd)
 
        if(Cmd_Argc(cmd) == 1)
        {
-               if(List_IsEmpty(&cbuf->deferred))
+               if(List_Is_Empty(&cbuf->deferred))
                        Con_Printf("No commands are pending.\n");
                else
                {
                        llist_t *pos;
-               List_ForEach(pos, &cbuf->deferred)
+               List_For_Each(pos, &cbuf->deferred)
                {
-                               current = List_Container(*pos, cmd_input_t, list);
+                               current = List_Entry(*pos, cmd_input_t, list);
                                Con_Printf("-> In %9.2f: %s\n", current->delay, current->text);
                        }
                }
        }
        else if(Cmd_Argc(cmd) == 2 && !strcasecmp("clear", Cmd_Argv(cmd, 1)))
        {
-               while(!List_IsEmpty(&cbuf->deferred))
+               while(!List_Is_Empty(&cbuf->deferred))
                        List_Move_Tail(cbuf->deferred.next, &cbuf->free);
        }
        else if(Cmd_Argc(cmd) == 3)
@@ -187,9 +187,9 @@ static cmd_input_t *Cbuf_LinkGet(cmd_buf_t *cbuf, cmd_input_t *existing)
        cmd_input_t *ret = NULL;
        if(existing && existing->pending)
                ret = existing;
-       else if(!List_IsEmpty(&cbuf->free))
+       else if(!List_Is_Empty(&cbuf->free))
        {
-               ret = List_Container(*cbuf->free.next, cmd_input_t, list);
+               ret = List_Entry(*cbuf->free.next, cmd_input_t, list);
                ret->length = 0;
                ret->pending = false;
        }
@@ -363,8 +363,8 @@ void Cbuf_AddText (cmd_state_t *cmd, const char *text)
                Con_Print("Cbuf_AddText: overflow\n");
        else
        {
-               Cbuf_LinkCreate(cmd, &llist, (List_IsEmpty(&cbuf->start) ? NULL : List_Container(*cbuf->start.prev, cmd_input_t, list)), text);
-               if(!List_IsEmpty(&llist))
+               Cbuf_LinkCreate(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(*cbuf->start.prev, cmd_input_t, list)), text);
+               if(!List_Is_Empty(&llist))
                        List_Splice_Tail(&llist, &cbuf->start);
        }
        Cbuf_Unlock(cbuf);
@@ -391,8 +391,8 @@ void Cbuf_InsertText (cmd_state_t *cmd, const char *text)
                Con_Print("Cbuf_InsertText: overflow\n");
        else
        {
-               Cbuf_LinkCreate(cmd, &llist, List_Container(*cbuf->start.next, cmd_input_t, list), text);
-               if(!List_IsEmpty(&llist))
+               Cbuf_LinkCreate(cmd, &llist, List_Entry(*cbuf->start.next, cmd_input_t, list), text);
+               if(!List_Is_Empty(&llist))
                        List_Splice(&llist, &cbuf->start);
        }
 
@@ -417,9 +417,9 @@ static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf)
                return;
        cbuf->deferred_oldtime = host.realtime;
 
-    List_ForEach(pos, &cbuf->deferred)
+    List_For_Each(pos, &cbuf->deferred)
        {
-               current = List_Container(*pos, cmd_input_t, list);
+               current = List_Entry(*pos, cmd_input_t, list);
                current->delay -= eat;
                if(current->delay <= 0)
                {
@@ -446,14 +446,14 @@ void Cbuf_Execute (cmd_buf_t *cbuf)
        // LadyHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes
        cbuf->tokenizebufferpos = 0;
 
-       while (!List_IsEmpty(&cbuf->start))
+       while (!List_Is_Empty(&cbuf->start))
        {
                /*
                 * Delete the text from the command buffer and move remaining
                 * commands down. This is necessary because commands (exec, alias)
                 * can insert data at the beginning of the text buffer
                 */
-               current = List_Container(*cbuf->start.next, cmd_input_t, list);
+               current = List_Entry(*cbuf->start.next, cmd_input_t, list);
                
                // Recycle memory so using WASD doesn't cause a malloc and free
                List_Move_Tail(&current->list, &cbuf->free);
@@ -1761,6 +1761,7 @@ static void Cmd_TokenizeString (cmd_state_t *cmd, const char *text)
 
        cmd->argc = 0;
        cmd->args = NULL;
+       cmd->cmdline = NULL;
 
        while (1)
        {
@@ -1784,6 +1785,8 @@ static void Cmd_TokenizeString (cmd_state_t *cmd, const char *text)
                if (!*text)
                        return;
 
+               if(!cmd->argc)
+                       cmd->cmdline = text;
                if (cmd->argc == 1)
                        cmd->args = text;
 
@@ -1887,6 +1890,7 @@ void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const
 
 
                                func = (cmd_function_t *)Mem_Alloc(cmd->mempool, sizeof(cmd_function_t));
+                               func->flags = flags;
                                func->name = cmd_name;
                                func->function = function;
                                func->description = description;