]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
Revert "Don't try to spawn if the worldmodel is missing. No way it's playable w/o it"
authorcloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 24 May 2020 13:31:40 +0000 (13:31 +0000)
committercloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 24 May 2020 13:31:40 +0000 (13:31 +0000)
This reverts commit 621bfbef71c6a151a6191ddbc0fabd0629e830ac.

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

cl_parse.c

index 7f2cdff4cde1ee61f0203f0e0be48edf97f02ee6..c0aab7c634da361f5ed3b0e1804ff016561559f7 100644 (file)
@@ -1279,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
@@ -1306,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)
                                {