Don't try to spawn if the worldmodel is missing. No way it's playable w/o it

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

diff --git a/cl_parse.c b/cl_parse.c
index f4310c19f27322d569f92c3b9b73acdcc38bd4cc..f8eea310ce3c1ec68e89a53736ede13990c0526c 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1280,8 +1280,12 @@ 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)
+                               if (cl.downloadmodel_current == 1) {
+                                       // No way any game is playable without the map.
                                        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
@@ -1303,8 +1307,6 @@ 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)
                                {