xonotic-data.pk3dir:Mario/infinite_overtimes: a S merge request: Adds the option to allow infinite overtimes.
git-manager created issue #1957 (closed) on 2014-05-08T07:36:48Z:
Adds the option to allow infinite overtimes.
Repository: xonotic/xonotic-data.pk3dir.git Commit: a8d5df2d Branch: Mario/infinite_overtimes
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'a8d5df2d37e850ba63e502168f5f2b20bcd396a2'..'origin/Mario/infinite_overtimes'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --edit --log --no-ff 'origin/Mario/infinite_overtimes'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'Mario/infinite_overtimes'
Diffstat:
qcsrc/server/g_world.qc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Revision log:
commit a8d5df2d37e850ba63e502168f5f2b20bcd396a2
Author: Mario
Commit: Mario
timelimit_overtimes -1 = infinite overtimes
User agreed to the license.
Diff:
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 875a0c3..d14ecc7 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1576,7 +1576,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
- 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 == -1) && autocvar_timelimit_overtime && !(g_race && !g_race_qualifying))
{
return 1; // need to call InitiateOvertime later
}