From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 22 Jan 2007 13:20:29 +0000 (+0000)
Subject: client no longer tries to download missing files from server if it is hosting the... 
X-Git-Tag: xonotic-v0.1.0preview~3686
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bba735499244568312faac2b77abcdd6a8449b31;p=xonotic%2Fdarkplaces.git

client no longer tries to download missing files from server if it is hosting the server


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

diff --git a/cl_parse.c b/cl_parse.c
index 1bd43db5..948a4b60 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -987,7 +987,7 @@ void CL_BeginDownloads(qboolean aborteddownload)
 				else
 					Con_Printf("Model %s not found\n", cl.model_name[cl.downloadmodel_current]);
 				// regarding the * check: don't try to download submodels
-				if (cl_serverextension_download.integer && cls.netcon && cl.model_name[cl.downloadmodel_current][0] != '*')
+				if (cl_serverextension_download.integer && cls.netcon && cl.model_name[cl.downloadmodel_current][0] != '*' && !sv.active)
 				{
 					Cmd_ForwardStringToServer(va("download %s", cl.model_name[cl.downloadmodel_current]));
 					// we'll try loading again when the download finishes
@@ -1036,7 +1036,7 @@ void CL_BeginDownloads(qboolean aborteddownload)
 			if (!FS_FileExists(soundname) && !FS_FileExists(cl.sound_name[cl.downloadsound_current]))
 			{
 				Con_Printf("Sound %s not found\n", soundname);
-				if (cl_serverextension_download.integer && cls.netcon)
+				if (cl_serverextension_download.integer && cls.netcon && !sv.active)
 				{
 					Cmd_ForwardStringToServer(va("download %s", soundname));
 					// we'll try loading again when the download finishes