Fix most Q3 & QL glow maps

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index d0af710c43e5cf19be9276f7f18c531dd94d7edc..c0aab7c634da361f5ed3b0e1804ff016561559f7 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1095,7 +1095,7 @@ static void CL_BeginDownloads(qboolean aborteddownload)
        // if we got here...
        // curl is done, so let's start with the business
        if(!cl.loadbegun)
-               SCR_PushLoadingScreen(false, "Loading precaches", 1);
+               SCR_PushLoadingScreen("Loading precaches", 1);
        cl.loadbegun = true;
 
        // if already downloading something from the previous level, don't stop it
@@ -1130,7 +1130,7 @@ static void CL_BeginDownloads(qboolean aborteddownload)
                if(cl.loadmodel_current == 1)
                {
                        // worldmodel counts as 16 models (15 + world model setup), for better progress bar
-                       SCR_PushLoadingScreen(false, "Loading precached models",
+                       SCR_PushLoadingScreen("Loading precached models",
                                (
                                        (cl.loadmodel_total - 1) * LOADPROGRESSWEIGHT_MODEL
                                +       LOADPROGRESSWEIGHT_WORLDMODEL
@@ -1142,11 +1142,10 @@ static void CL_BeginDownloads(qboolean aborteddownload)
                                +       cl.loadsound_total * LOADPROGRESSWEIGHT_SOUND
                                )
                        );
-                       SCR_BeginLoadingPlaque(false);
                }
                for (;cl.loadmodel_current < cl.loadmodel_total;cl.loadmodel_current++)
                {
-                       SCR_PushLoadingScreen(false, cl.model_name[cl.loadmodel_current],
+                       SCR_PushLoadingScreen(cl.model_name[cl.loadmodel_current],
                                (
                                        (cl.loadmodel_current == 1) ? LOADPROGRESSWEIGHT_WORLDMODEL : LOADPROGRESSWEIGHT_MODEL
                                ) / (
@@ -1160,7 +1159,7 @@ static void CL_BeginDownloads(qboolean aborteddownload)
                                SCR_PopLoadingScreen(false);
                                if(cl.loadmodel_current == 1)
                                {
-                                       SCR_PushLoadingScreen(false, cl.model_name[cl.loadmodel_current], 1.0 / cl.loadmodel_total);
+                                       SCR_PushLoadingScreen(cl.model_name[cl.loadmodel_current], 1.0 / cl.loadmodel_total);
                                        SCR_PopLoadingScreen(false);
                                }
                                continue;
@@ -1183,7 +1182,7 @@ static void CL_BeginDownloads(qboolean aborteddownload)
                        if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw && cl.loadmodel_current == 1)
                        {
                                // we now have the worldmodel so we can set up the game world
-                               SCR_PushLoadingScreen(true, "world model setup",
+                               SCR_PushLoadingScreen("world model setup",
                                        (
                                                LOADPROGRESSWEIGHT_WORLDMODEL_INIT
                                        ) / (
@@ -1211,7 +1210,7 @@ static void CL_BeginDownloads(qboolean aborteddownload)
        {
                // loading sounds
                if(cl.loadsound_current == 1)
-                       SCR_PushLoadingScreen(false, "Loading precached sounds",
+                       SCR_PushLoadingScreen("Loading precached sounds",
                                (
                                        cl.loadsound_total * LOADPROGRESSWEIGHT_SOUND
                                ) / (
@@ -1223,7 +1222,7 @@ static void CL_BeginDownloads(qboolean aborteddownload)
                        );
                for (;cl.loadsound_current < cl.loadsound_total;cl.loadsound_current++)
                {
-                       SCR_PushLoadingScreen(false, cl.sound_name[cl.loadsound_current], 1.0 / cl.loadsound_total);
+                       SCR_PushLoadingScreen(cl.sound_name[cl.loadsound_current], 1.0 / cl.loadsound_total);
                        if (cl.sound_precache[cl.loadsound_current] && S_IsSoundPrecached(cl.sound_precache[cl.loadsound_current]))
                        {
                                SCR_PopLoadingScreen(false);
@@ -1280,12 +1279,8 @@ static void CL_BeginDownloads(qboolean aborteddownload)
                        CL_KeepaliveMessage(true);
                        if (cl.model_name[cl.downloadmodel_current][0] != '*' && strcmp(cl.model_name[cl.downloadmodel_current], "null") && !FS_FileExists(cl.model_name[cl.downloadmodel_current]))
                        {
-                               if (cl.downloadmodel_current == 1) {
-                                       // No way any game is playable without the map.
+                               if (cl.downloadmodel_current == 1)
                                        Con_Printf("Map %s not found\n", cl.model_name[cl.downloadmodel_current]);
-                                       CL_Disconnect();
-                                       return;
-                               }
                                else
                                        Con_Printf("Model %s not found\n", cl.model_name[cl.downloadmodel_current]);
                                // regarding the * check: don't try to download submodels
@@ -1307,6 +1302,8 @@ static void CL_BeginDownloads(qboolean aborteddownload)
                        if (cl.downloadmodel_current == 1)
                        {
                                // we now have the worldmodel so we can set up the game world
+                               // or maybe we do not have it (cl_serverextension_download 0)
+                               // then we need to continue loading ANYWAY!
                                CL_SetupWorldModel();
                                if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
                                {