From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 22 Dec 2004 18:19:59 +0000 (+0000)
Subject: don't send a bunch of svc_precache messages in the serverinfo packet (no longer produ... 
X-Git-Tag: xonotic-v0.1.0preview~5257
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=492928754902edc961890ad93aa05c19a9a68646;p=xonotic%2Fdarkplaces.git

don't send a bunch of svc_precache messages in the serverinfo packet (no longer produces svc_precache messages if server state is ss_loading)


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

diff --git a/sv_main.c b/sv_main.c
index ae0a38bc..73d2fdbe 100644
--- a/sv_main.c
+++ b/sv_main.c
@@ -1354,7 +1354,7 @@ int SV_ModelIndex(char *s, int precachemode)
 					Con_Printf("SV_ModelIndex(\"%s\"): not precached (fix your code), precaching anyway\n", filename);
 				strlcpy(sv.model_precache[i], filename, sizeof(sv.model_precache[i]));
 				sv.models[i] = Mod_ForName (sv.model_precache[i], true, false, false);
-				if (sv.protocol == PROTOCOL_DARKPLACES6)
+				if (sv.protocol == PROTOCOL_DARKPLACES6 && sv.state != ss_loading)
 				{
 					MSG_WriteByte(&sv.reliable_datagram, svc_precache);
 					MSG_WriteShort(&sv.reliable_datagram, i);
@@ -1402,7 +1402,7 @@ int SV_SoundIndex(char *s, int precachemode)
 				if (precachemode == 1)
 					Con_Printf("SV_SoundIndex(\"%s\"): not precached (fix your code), precaching anyway\n", filename);
 				strlcpy(sv.sound_precache[i], filename, sizeof(sv.sound_precache[i]));
-				if (sv.protocol == PROTOCOL_DARKPLACES6)
+				if (sv.protocol == PROTOCOL_DARKPLACES6 && sv.state != ss_loading)
 				{
 					MSG_WriteByte(&sv.reliable_datagram, svc_precache);
 					MSG_WriteShort(&sv.reliable_datagram, i + 32768);