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

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 1bd43db5c25a761baf751c0c8c112974f506e4f7..948a4b60409a886075242b5bb4a33650383563f8 100644 (file)
--- 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