twice as many models loadable (for LOD and stuff)

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index ad220a3f1f9136ff192205add1a7297deb50a45b..7d49db566f31d90ca975b8283319db867feec2e1 100644 (file)
--- a/console.c
+++ b/console.c
@@ -75,9 +75,9 @@ cvar_t con_nickcompletion_flags = {CVAR_SAVE, "con_nickcompletion_flags", "11",
 #define NICKS_ALPHANUMERICS_ONLY 8
 #define NICKS_NO_SPACES 16
 
-cvar_t con_completion_playdemo = {CVAR_SAVE, "con_completion_playdemo", "*.dem"};
-cvar_t con_completion_timedemo = {CVAR_SAVE, "con_completion_timedemo", "*.dem"};
-cvar_t con_completion_exec = {CVAR_SAVE, "con_completion_exec", "*.cfg"};
+cvar_t con_completion_playdemo = {CVAR_SAVE, "con_completion_playdemo", "*.dem", "completion pattern for the playdemo command"};
+cvar_t con_completion_timedemo = {CVAR_SAVE, "con_completion_timedemo", "*.dem", "completion pattern for the timedemo command"};
+cvar_t con_completion_exec = {CVAR_SAVE, "con_completion_exec", "*.cfg", "completion pattern for the exec command"};
 
 int con_linewidth;
 int con_vislines;
@@ -95,9 +95,9 @@ char rcon_redirect_buffer[1400];
 void ConBuffer_Init(conbuffer_t *buf, int textsize, int maxlines, mempool_t *mempool)
 {
        buf->textsize = textsize;
-       buf->text = Mem_Alloc(mempool, textsize);
+       buf->text = (char *) Mem_Alloc(mempool, textsize);
        buf->maxlines = maxlines;
-       buf->lines = Mem_Alloc(mempool, maxlines * sizeof(*buf->lines));
+       buf->lines = (con_lineinfo_t *) Mem_Alloc(mempool, maxlines * sizeof(*buf->lines));
        buf->lines_first = 0;
        buf->lines_count = 0;
 }
@@ -160,7 +160,7 @@ void ConBuffer_DeleteLine(conbuffer_t *buf)
        if(buf->lines_count == 0)
                return;
        --buf->lines_count;
-       buf->lines_first = (buf->lines_first) % buf->maxlines;
+       buf->lines_first = (buf->lines_first + 1) % buf->maxlines;
 }
 
 /*
@@ -610,6 +610,8 @@ void Con_MessageMode_f (void)
 {
        key_dest = key_message;
        chat_mode = 0; // "say"
+       chat_bufferlen = 0;
+       chat_buffer[0] = 0;
 }
 
 
@@ -622,6 +624,8 @@ void Con_MessageMode2_f (void)
 {
        key_dest = key_message;
        chat_mode = 1; // "say_team"
+       chat_bufferlen = 0;
+       chat_buffer[0] = 0;
 }
 
 /*