Merge branch 'master' into Mario/weapons

[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 d1306f5c26b44460c80811802fbb344bad597f29..b7c970715fe7e2e175d651bd98fc3b176911a5f6 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1575,7 +1575,7 @@ float InitiateSuddenDeath()
        // - for this timelimit_overtime needs to be >0 of course
        // - also check the winning condition calculated in the previous frame and only add normal overtime
        //   again, if at the point at which timelimit would be extended again, still no winner was found
        // - for this timelimit_overtime needs to be >0 of course
        // - also check the winning condition calculated in the previous frame and only add normal overtime
        //   again, if at the point at which timelimit would be extended again, still no winner was found

-       if (!autocvar_g_campaign && (checkrules_overtimesadded >= 0) && (checkrules_overtimesadded < autocvar_timelimit_overtimes) && autocvar_timelimit_overtime && !(g_race && !g_race_qualifying))
+       if (!autocvar_g_campaign && (checkrules_overtimesadded >= 0) && (checkrules_overtimesadded < autocvar_timelimit_overtimes || autocvar_timelimit_overtimes < 0) && autocvar_timelimit_overtime && !(g_race && !g_race_qualifying))

        {
                return 1; // need to call InitiateOvertime later
        }
        {
                return 1; // need to call InitiateOvertime later
        }


@@ -2729,6 +2729,8 @@ string GotoMap(string m)
 
 void EndFrame()
 {
 
 void EndFrame()
 {

+       anticheat_endframe();
+

        float altime;
        FOR_EACH_REALCLIENT(self)
        {
        float altime;
        FOR_EACH_REALCLIENT(self)
        {