From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 25 Apr 2011 18:36:48 +0000 (+0200)
Subject: do not remove non-.serverpackage files from sv_curl_serverpackages
X-Git-Tag: xonotic-v0.5.0~264^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d04323e72271788a5adab7c23791e5bbd39b2568;p=xonotic%2Fxonotic-data.pk3dir.git

do not remove non-.serverpackage files from sv_curl_serverpackages
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index c45ad96e2..9c188293e 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -919,6 +919,9 @@ void spawnfunc_worldspawn (void)
 	{
 		fd = search_begin("*.serverpackage", TRUE, FALSE);
 		s = "";
+		for(i = 0; i < n; ++i)
+			if(substring(argv(i), -14, -1) != ".serverpackage")
+				s = strcat(s, " ", argv(i));
 		if(fd >= 0)
 		{
 			j = search_getsize(fd);
@@ -926,6 +929,7 @@ void spawnfunc_worldspawn (void)
 				s = strcat(s, " ", search_getfilename(fd, i));
 			search_end(fd);
 		}
+		n = tokenize_console(cvar_string("sv_curl_serverpackages"));
 		cvar_set("sv_curl_serverpackages", substring(s, 1, -1));
 	}