Fix crash when using +map on cmdline by starting video before parsing configs

Also removed redundant loading screen call, to avoid resolution weirdness

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12628 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_main.c b/cl_main.c
index 83f7d97cd90b400d518ba437c7f875b1a2e37e5a..8357ebb1d939bfcea0def97d3da0a319499f9b74 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -2777,4 +2777,5 @@ void CL_Init (void)
        CL_MeshEntities_Init();
 
        CL_Video_Init();
+       Host_StartVideo();
 }

diff --git a/gl_draw.c b/gl_draw.c
index 18e38754dc97b7072a98a723e41802eee8fc9102..b705e4cb3821fd1c9bac04c4486af49cdd53c563 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -703,9 +703,6 @@ static void gl_draw_start(void)
        for(i = 0; i < dp_fonts.maxsize; ++i)
                if (dp_fonts.f[i].title[0])
                        LoadFont(false, va(vabuf, sizeof(vabuf), "gfx/font_%s", dp_fonts.f[i].title), &dp_fonts.f[i], 1, 0);
-
-       // draw the loading screen so people have something to see in the newly opened window
-       SCR_UpdateLoadingScreen(true, true);
 }
 
 static void gl_draw_shutdown(void)

diff --git a/host.c b/host.c
index e659909fc8042d03a1a56eb6cdfc20cc1b84d720..f19f950c6e258dfbb6fd2cfb4e3c05d09fbbb170 100644 (file)
--- a/host.c
+++ b/host.c
@@ -1315,9 +1315,6 @@ static void Host_Init (void)
 
        Log_Start();
        
-       // Starting after we parse commands so the screen resolution doesn't get weird for the first few seconds
-       Host_StartVideo();
-       
        // put up the loading image so the user doesn't stare at a black screen...
        SCR_BeginLoadingPlaque(true);