made darkplaces compile successfully with g++ to test for errors C doesn't care about...

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 63236dea7045cc6762ebba87815603ca11d5bf81..7fbe3056183fd40e25f417cfc1757a15f9503e45 100644 (file)
--- a/console.c
+++ b/console.c
@@ -51,13 +51,6 @@ float con_times[MAX_NOTIFYLINES];
 
 int con_vislines;
 
-#define MAXCMDLINE     256
-extern char key_lines[32][MAXCMDLINE];
-extern int edit_line;
-extern int key_linepos;
-extern int key_insert;
-
-
 qboolean con_initialized;
 
 
@@ -189,11 +182,11 @@ void Log_ConPrint (const char *msg)
                // If we need to enlarge the log queue
                if (len > remain)
                {
-                       unsigned int factor = ((logq_ind + len) / logq_size) + 1;
+                       size_t factor = ((logq_ind + len) / logq_size) + 1;
                        qbyte* newqueue;
 
                        logq_size *= factor;
-                       newqueue = Mem_Alloc (tempmempool, logq_size);
+                       newqueue = (qbyte *)Mem_Alloc (tempmempool, logq_size);
                        memcpy (newqueue, logqueue, logq_ind);
                        Mem_Free (logqueue);
                        logqueue = newqueue;
@@ -376,7 +369,7 @@ void Con_Init (void)
 
        // Allocate a log queue
        logq_size = 512;
-       logqueue = Mem_Alloc (tempmempool, logq_size);
+       logqueue = (qbyte *)Mem_Alloc (tempmempool, logq_size);
        logq_ind = 0;
 
        Cvar_RegisterVariable (&log_file);
@@ -549,8 +542,8 @@ void Con_Print(const char *msg)
                if (index == 0)
                {
                        // if this is the beginning of a new line, print timestamp
-                       char *timestamp = timestamps.integer ? Sys_TimeString(timeformat.string) : "";
-                       // reset the color 
+                       const char *timestamp = timestamps.integer ? Sys_TimeString(timeformat.string) : "";
+                       // reset the color
                        // FIXME: 1. perhaps we should use a terminal system 2. use a constant instead of 7!
                        line[index++] = STRING_COLOR_TAG;
                        // assert( STRING_COLOR_DEFAULT < 10 )
@@ -578,7 +571,7 @@ void Con_Print(const char *msg)
                        }
                        // store timestamp
                        for (;*timestamp;index++, timestamp++)
-                               if (index < sizeof(line) - 2)
+                               if (index < (int)sizeof(line) - 2)
                                        line[index] = *timestamp;
                }
                // append the character
@@ -700,7 +693,7 @@ void Con_DrawInput (void)
        // use strlen of edit_line instead of key_linepos to allow editing
        // of early characters w/o erasing
 
-       y = strlen(text);
+       y = (int)strlen(text);
 
 // fill out remainder with spaces
        for (i = y; i < 256; i++)
@@ -737,7 +730,7 @@ void Con_DrawNotify (void)
        char    *text;
        int             i;
        float   time;
-       extern char chat_buffer[];
+       extern char chat_buffer[256];
        char    temptext[256];
        int colorindex = -1; //-1 for default
 
@@ -770,8 +763,8 @@ void Con_DrawNotify (void)
                } else
                        x = 0;
 
-               DrawQ_ColoredString( x, v, text, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex ); 
-                       
+               DrawQ_ColoredString( x, v, text, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+
                v += 8;
        }
 
@@ -787,7 +780,7 @@ void Con_DrawNotify (void)
                        sprintf(temptext, "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
                else
                        sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
-               while (strlen(temptext) >= (size_t) con_linewidth)
+               while ((int)strlen(temptext) >= con_linewidth)
                {
                        DrawQ_ColoredString( 0, v, temptext, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
                        strcpy(temptext, &temptext[con_linewidth]);
@@ -809,7 +802,6 @@ Draws the console with the solid background
 The typing input line at the bottom should only be drawn if typing is allowed
 ================
 */
-extern char engineversion[40];
 void Con_DrawConsole (int lines)
 {
        int i, y, rows, j;
@@ -858,7 +850,7 @@ void Con_DisplayList(const char **list)
        const char **walk = list;
 
        while (*walk) {
-               len = strlen(*walk);
+               len = (int)strlen(*walk);
                if (len > maxlen)
                        maxlen = len;
                walk++;
@@ -866,7 +858,7 @@ void Con_DisplayList(const char **list)
        maxlen += 1;
 
        while (*list) {
-               len = strlen(*list);
+               len = (int)strlen(*list);
                if (pos + maxlen >= width) {
                        Con_Print("\n");
                        pos = 0;
@@ -916,7 +908,7 @@ void Con_CompleteCommandLine (void)
                else
                        list[0] = Cmd_CompleteAliasBuildList(s);
                cmd = *list[0];
-               cmd_len = strlen (cmd);
+               cmd_len = (int)strlen (cmd);
        } else {
                if (c)
                        cmd = *(list[0] = Cmd_CompleteBuildList(s));
@@ -925,7 +917,7 @@ void Con_CompleteCommandLine (void)
                if (a)
                        cmd = *(list[2] = Cmd_CompleteAliasBuildList(s));
 
-               cmd_len = strlen (s);
+               cmd_len = (int)strlen (s);
                do {
                        for (i = 0; i < 3; i++) {
                                char ch = cmd[cmd_len];