Merge branch 'bones_was_here/fc_auto_helpme' into 'master'

Whitelist g_ctf_flagcarrier_auto_helpme_damage

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

diff --combined qcsrc/server/world.qc
index 2e494450edcfd422f9647caabe982d8e9271468b,0ae80d3020afb0f8a8621178d1fcffdb1ebefc80..6c397d05353850515f0b2af7ce2870ef1a1875fb
--- 1/qcsrc/server/world.qc
--- 2/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@@ -69,7 -69,7 +69,7 @@@ void PingPLReport_Think(entity this
        {
                WriteHeader(MSG_BROADCAST, TE_CSQC_PINGPLREPORT);
                WriteByte(MSG_BROADCAST, this.cnt);
 -              WriteShort(MSG_BROADCAST, bound(1, CS(e).ping, 32767));
 +              WriteShort(MSG_BROADCAST, bound(1, rint(CS(e).ping), 32767));
                WriteByte(MSG_BROADCAST, min(ceil(CS(e).ping_packetloss * 255), 255));
                WriteByte(MSG_BROADCAST, min(ceil(CS(e).ping_movementloss * 255), 255));
  
@@@ -353,6 -353,7 +353,7 @@@ void cvar_changes_init(
                BADCVAR("g_ctf_flag_glowtrails");
                BADCVAR("g_ctf_dynamiclights");
                BADCVAR("g_ctf_flag_pickup_verbosename");
+               BADCVAR("g_ctf_flagcarrier_auto_helpme_damage");
                BADPRESUFFIX("g_ctf_flag_", "_model");
                BADPRESUFFIX("g_ctf_flag_", "_skin");
                BADCVAR("g_domination_point_leadlimit");
@@@ -388,7 -389,6 +389,7 @@@
                BADCVAR("sv_minigames");
                BADCVAR("sv_namechangetimer");
                BADCVAR("sv_precacheplayermodels");
 +              BADCVAR("sv_qcphysics");
                BADCVAR("sv_radio");
                BADCVAR("sv_stepheight");
                BADCVAR("sv_timeout");
@@@ -444,7 -444,6 +445,7 @@@
                BADCVAR("g_ctf_leaderboard");
                BADCVAR("g_domination_point_limit");
                BADCVAR("g_domination_teams_override");
 +              BADCVAR("g_freezetag_revive_spawnshield");
                BADCVAR("g_freezetag_teams_override");
                BADCVAR("g_friendlyfire");
                BADCVAR("g_fullbrightitems");
@@@ -463,7 -462,7 +464,7 @@@
                BADCVAR("g_player_brightness");
                BADCVAR("g_rocket_flying");
                BADCVAR("g_rocket_flying_disabledelays");
 -              BADCVAR("g_spawnshieldtime");
 +              BADPREFIX("g_spawnshield");
                BADCVAR("g_start_delay");
                BADCVAR("g_superspectate");
                BADCVAR("g_tdm_teams_override");
@@@ -840,8 -839,7 +841,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));
@@@ -868,6 -866,12 +869,6 @@@
                if(autocvar_g_norecoil)
                        s = strcat(s, ":norecoil");
  
 -              // TODO to mutator system
 -              if(autocvar_g_powerups == 0)
 -                      s = strcat(s, ":no_powerups");
 -              if(autocvar_g_powerups > 0)
 -                      s = strcat(s, ":powerups");
 -
                GameLogEcho(s);
                GameLogEcho(":gameinfo:end");
        }
@@@ -2206,11 -2210,11 +2207,11 @@@ void droptofloor(entity this
  }
  
  bool autocvar_sv_gameplayfix_multiplethinksperframe = true;
 -void RunThink(entity this)
 +void RunThink(entity this, float dt)
  {
        // don't let things stay in the past.
        // it is possible to start that way by a trigger with a local time.
 -      if(this.nextthink <= 0 || this.nextthink > time + frametime)
 +      if(this.nextthink <= 0 || this.nextthink > time + dt)
                return;
  
        float oldtime = time; // do we need to save this?
@@@ -2226,7 -2230,7 +2227,7 @@@
                // we don't want to loop in that case, so exit if the new nextthink is
                // <= the time the qc was told, also exit if it is past the end of the
                // frame
 -              if(this.nextthink <= time || this.nextthink > oldtime + frametime || !autocvar_sv_gameplayfix_multiplethinksperframe)
 +              if(this.nextthink <= time || this.nextthink > oldtime + dt || !autocvar_sv_gameplayfix_multiplethinksperframe)
                        break;
        }
  
@@@ -2256,8 -2260,8 +2257,8 @@@ void Physics_Frame(
                        if(it.move_movetype == MOVETYPE_PUSH || it.move_movetype == MOVETYPE_FAKEPUSH)
                                continue; // these movetypes have no regular think function
                        // handle thinking here
 -                      if (getthink(it) && it.nextthink > 0 && it.nextthink <= time + frametime)
 -                              RunThink(it);
 +                      if (getthink(it) && it.nextthink > 0 && it.nextthink <= time + PHYS_INPUT_TIMELENGTH)
 +                              RunThink(it, PHYS_INPUT_TIMELENGTH);
                }
        });