X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=522f4f041cc49af4810c0f53fb2070f30c4e75e4;hp=038936ee49282bff375700dd76159197aea86d8f;hb=8e5d376c49510049572c7c182ba8778c8a8f80dd;hpb=69eda62d02bc02ff50547bad514af3f7ce487413

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 038936ee49..522f4f041c 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -265,6 +265,7 @@ void cvar_changes_init()
 		BADCVAR("g_dm");
 		BADCVAR("g_domination");
 		BADCVAR("g_domination_default_teams");
+		BADCVAR("g_duel");
 		BADCVAR("g_freezetag");
 		BADCVAR("g_freezetag_teams");
 		BADCVAR("g_invasion_teams");
@@ -1611,7 +1612,9 @@ 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_overtimes < 0) && 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
 	}
@@ -1634,11 +1637,7 @@ void InitiateOvertime() // ONLY call this if InitiateSuddenDeath returned true
 {
 	++checkrules_overtimesadded;
 	//add one more overtime by simply extending the timelimit
-	float tl;
-	tl = autocvar_timelimit;
-	tl += autocvar_timelimit_overtime;
-	cvar_set("timelimit", ftos(tl));
-
+	cvar_set("timelimit", ftos(autocvar_timelimit + autocvar_timelimit_overtime));
 	Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_OVERTIME_TIME, autocvar_timelimit_overtime * 60);
 }
 
@@ -1777,7 +1776,7 @@ float WinningCondition_RanOutOfSpawns()
 	{
 		Team_SetTeamScore(Team_GetTeamFromIndex(i), 0);
 	}
-	
+
 	FOREACH_CLIENT(IS_PLAYER(it) && !IS_DEAD(it),
 	{
 		if (Team_IsValidTeam(it.team))