merge some changes from my autocvarizer branch that change nothing but make code...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_world.qc

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index f72d32236ffd880a0ba47ed3c6e919bf3846689a..27d7a69c7cb369e89fa55c6556c30de10c6bd582 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -614,15 +614,6 @@ void spawnfunc_worldspawn (void)
 
        TemporaryDB = db_create();
 
-       /*
-       TODO sound pack system
-       // initialize sound pack system
-       soundpack = cvar_string("g_soundpack");
-       if(soundpack != "")
-               soundpack = strcat(soundpack, "/");
-       soundpack = strzone(soundpack);
-       */
-
        // 0 normal
        lightstyle(0, "m");
 
@@ -696,7 +687,7 @@ void spawnfunc_worldspawn (void)
        GameLogInit(); // prepare everything
        if(cvar("sv_eventlog"))
        {
-               s = strcat(cvar_string("sv_eventlog_files_counter"), ".");
+               s = strcat(ftos(cvar("sv_eventlog_files_counter")), ".");
                s = strcat(s, ftos(random()));
                matchid = strzone(s);
 
@@ -2736,7 +2727,7 @@ void MapVote_Start()
                return;
 
        // wait for stats to be sent first
-       if(!playerstats_sent)
+       if(!playerstats_waitforme)
                return;
 
        MapInfo_Enumerate();