From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 13 Aug 2008 10:54:03 +0000 (+0000)
Subject: GAME_NEXUIZ: fix world model not getting initialized when it could not be found ... 
X-Git-Tag: xonotic-v0.1.0preview~2132
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=776382c23779b71848856e606a7dbd32ab4c38f6;p=xonotic%2Fdarkplaces.git

GAME_NEXUIZ: fix world model not getting initialized when it could not be found (e.g. 404)


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

diff --git a/cl_parse.c b/cl_parse.c
index d6423d1b..07ae54f4 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1046,7 +1046,7 @@ void CL_BeginDownloads(qboolean aborteddownload)
 	}
 
 	if(gamemode == GAME_NEXUIZ)
-		goto skipdownloads;
+		Cvar_SetValueQuick(&cl_serverextension_download, false);
 		// in Nexuiz, the built in download protocol is kinda broken (misses lots
 		// of dependencies) anyway, and can mess around with the game directory;
 		// until this is fixed, only support pk3 downloads via curl, and turn off
@@ -1103,6 +1103,8 @@ 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)
 				{
@@ -1151,7 +1153,6 @@ void CL_BeginDownloads(qboolean aborteddownload)
 		// finished loading sounds
 	}
 
-skipdownloads:
 	if (!cl.loadfinished)
 	{
 		cl.loadfinished = true;