]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
fix last fix :)
authorRudolf Polzer <divverent@alientrap.org>
Mon, 25 Apr 2011 18:37:22 +0000 (20:37 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 25 Apr 2011 18:37:22 +0000 (20:37 +0200)
qcsrc/server/g_world.qc

index 9c188293e30fd88124d7f5c50fbcb0945b890d78..bf033e4d6801531fd003a22fe7116efd2b67736d 100644 (file)
@@ -917,11 +917,12 @@ void spawnfunc_worldspawn (void)
        // fill sv_curl_serverpackages from .serverpackage files
        if(autocvar_sv_curl_serverpackages_auto)
        {
-               fd = search_begin("*.serverpackage", TRUE, FALSE);
                s = "";
+               n = tokenize_console(cvar_string("sv_curl_serverpackages"));
                for(i = 0; i < n; ++i)
                        if(substring(argv(i), -14, -1) != ".serverpackage")
                                s = strcat(s, " ", argv(i));
+               fd = search_begin("*.serverpackage", TRUE, FALSE);
                if(fd >= 0)
                {
                        j = search_getsize(fd);
@@ -929,7 +930,6 @@ 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));
        }