sys: Initialize the memory subsystem in main()

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 6bf28ec7d87d26e5d197606f1769ba064a170703..7a523605bbf63aa063cf83975e40501681d0a2b6 100644 (file)
--- a/console.c
+++ b/console.c
@@ -933,7 +933,7 @@ void Con_Init (void)
        // initialize console window (only used by sys_win.c)
        Sys_InitConsole();
        
-       Con_DPrint("Console initialized.\n");
+       Con_Print("Console initialized.\n");
 }
 
 void Con_Shutdown (void)
@@ -1530,7 +1530,7 @@ static void Con_DrawInput(qboolean is_console, float x, float v, float inputsize
        char text[MAX_INPUTLINE + 5 + 9 + 1]; // space for ^xRGB, "say_team:" and \0
        float xo;
        size_t len_out;
-       char *prefix;
+       const char *prefix;
        dp_font_t *fnt;
 
        if (is_console && !key_consoleactive)
@@ -2125,7 +2125,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
        unsigned char buf[1024];
 
        dpsnprintf(message, sizeof(message), "maps/%s*.bsp", s);
-       t = FS_Search(message, 1, true);
+       t = FS_Search(message, 1, true, NULL);
        if(!t)
                return false;
        if (t->numfilenames > 1)
@@ -2843,7 +2843,7 @@ int Con_CompleteCommandLine(cmd_state_t *cmd, qboolean is_console)
                                        fssearch_t *search;
                                        if(strchr(com_token, '/'))
                                        {
-                                               search = FS_Search(com_token, true, true);
+                                               search = FS_Search(com_token, true, true, NULL);
                                        }
                                        else
                                        {
@@ -2852,10 +2852,10 @@ int Con_CompleteCommandLine(cmd_state_t *cmd, qboolean is_console)
                                                {
                                                        strlcpy(t, s, min(sizeof(t), (unsigned int)(slash - s + 2))); // + 2, because I want to include the slash
                                                        strlcat(t, com_token, sizeof(t));
-                                                       search = FS_Search(t, true, true);
+                                                       search = FS_Search(t, true, true, NULL);
                                                }
                                                else
-                                                       search = FS_Search(com_token, true, true);
+                                                       search = FS_Search(com_token, true, true, NULL);
                                        }
                                        if(search)
                                        {
@@ -2875,10 +2875,10 @@ int Con_CompleteCommandLine(cmd_state_t *cmd, qboolean is_console)
                                        {
                                                strlcpy(t, s, min(sizeof(t), (unsigned int)(slash - s + 2))); // + 2, because I want to include the slash
                                                strlcat(t, "*", sizeof(t));
-                                               search = FS_Search(t, true, true);
+                                               search = FS_Search(t, true, true, NULL);
                                        }
                                        else
-                                               search = FS_Search("*", true, true);
+                                               search = FS_Search("*", true, true, NULL);
                                        if(search)
                                        {
                                                for(i = 0; i < search->numfilenames; ++i)