]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/strftime_s' into 'master'
authorterencehill <piuntn@gmail.com>
Mon, 24 May 2021 10:07:22 +0000 (10:07 +0000)
committerterencehill <piuntn@gmail.com>
Mon, 24 May 2021 10:07:22 +0000 (10:07 +0000)
strftime_s

Closes #2588

See merge request xonotic/xonotic-data.pk3dir!903

1  2 
qcsrc/server/world.qc

diff --combined qcsrc/server/world.qc
index 6628b4236c39ab3ed7d1592af909b50e9b4c1356,9cf7b18d99c54e90849879e40419f6c63b5a2277..dd8e86b78ddc62fd49e90d8f2c71807403044f14
@@@ -408,7 -408,7 +408,7 @@@ void cvar_changes_init(
                BADPREFIX("skill_");
                BADPREFIX("sv_allow_");
                BADPREFIX("sv_cullentities_");
 -              BADPREFIX("sv_maxidle_");
 +              BADPREFIX("sv_maxidle");
                BADPREFIX("sv_minigames_");
                BADPREFIX("sv_radio_");
                BADPREFIX("sv_timeout_");
                BADCVAR("sv_defaultplayercolors");
                BADCVAR("sv_defaultplayermodel");
                BADCVAR("sv_defaultplayerskin");
 -              BADCVAR("sv_maxidle");
                BADCVAR("sv_maxrate");
                BADCVAR("sv_motd");
                BADCVAR("sv_public");
@@@ -838,7 -839,8 +838,8 @@@ spawnfunc(worldspawn
        // character set: ASCII 33-126 without the following characters: : ; ' " \ $
        if(autocvar_sv_eventlog)
        {
-               string s = sprintf("%s.%s.%06d", itos(autocvar_sv_eventlog_files_counter), strftime(false, "%s"), floor(random() * 1000000));
+               string num = strftime_s(); // strftime(false, "%s") isn't reliable, see strftime_s description
+               string s = sprintf("%s.%s.%06d", itos(autocvar_sv_eventlog_files_counter), num, floor(random() * 1000000));
                matchid = strzone(s);
  
                GameLogEcho(strcat(":gamestart:", GetGametype(), "_", GetMapname(), ":", s));