sv_curl_serverpackages_auto: auto add all packs with a *.serverpackage file to server...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 57a16529eba379b4ee5873c047a82f35891faccf..8e29eb492dc5c084425a503bc70a7d322dec56fa 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1142,6 +1142,7 @@ seta sv_servermodelsonly 1
 cl_curl_enabled 1
 cl_curl_maxspeed 300
 sv_curl_defaulturl "http://www.xonotic.com/contentdownload/getmap.php?file="
+set sv_curl_serverpackages_auto 0 "automatically add packs with *.serverpackage files to sv_curl_serverpackages"
 
 set sv_motd ""
 

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 07898df16817501ada15cc655255c3cec5cf9f0e..73e7172d277d1a9812890b0f4c0ca2db868c27e0 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -703,6 +703,17 @@ void spawnfunc_worldspawn (void)
 
        localcmd("\n_sv_hook_gamestart ", GetGametype(), "\n");
 
+       // fill sv_curl_serverpackages from .serverpackage files
+       if(cvar("sv_curl_serverpackages_auto"))
+       {
+               fd = search_begin("*.serverpackage", TRUE, FALSE);
+               j = search_getsize(fd);
+               s = "";
+               for(i = 0; i < j; ++i)
+                       s = strcat(s, " ", search_getfilename(i));
+               cvar_set("sv_curl_serverpackages", substring(s, 1, -1));
+       }
+
        world_initialized = 1;
 }