fixed picking golden frag with overtime command, fixed sudden death logic to not return early on golden frag

Author: FranciszekMecka

src/client.c

@@ -2470,6 +2470,7 @@ void Check_SD(gedict_t *p)
 			}
 			return;
 		}
+
 		case SD_GOLDEN_FRAG: {
 			gedict_t *ed1 = get_ed_scores1(), *ed2 = get_ed_scores2();
 			int sc = get_scores1() - get_scores2();

src/commands.c

@@ -1732,7 +1732,7 @@ void ChangeOvertime(void)
 		return;
 	}
 
-	f1 = bound(0, cvar("k_overtime"), 3);
+	f1 = bound(0, cvar("k_overtime"), 4);
 	f2 = bound(0, cvar("k_exttime"), 999);
 
 	if (!f1)
@@ -1759,13 +1759,13 @@ void ChangeOvertime(void)
 	}
 	else if (f1 == 3)
 	{
-		cvar_fset("k_overtime", 0);
-		G_bprint(2, "%s: off\n", redtext("Overtime"));
+		cvar_fset("k_overtime", SD_GOLDEN_FRAG);
+		G_bprint(2, "%s: golden frag\n", redtext("Overtime"));
 	}
 	else if (f1 == SD_GOLDEN_FRAG)
 	{
-		cvar_fset("k_overtime", SD_GOLDEN_FRAG);
-		G_bprint(2, "%s: golden frag\n", redtext("Overtime"));
+		cvar_fset("k_overtime", 0);
+		G_bprint(2, "%s: off\n", redtext("Overtime"));
 	}
 
 }

src/match.c

@@ -534,7 +534,7 @@ void CheckOvertime(void)
 
 	// If 0 no overtime, 1 overtime, 2 sudden death
 	// And if its neither then well we exit
-	if (!k_mb_overtime || ((k_mb_overtime != 1) && (k_mb_overtime != 2) && (k_mb_overtime != 3)))
+	if (!k_mb_overtime || ((k_mb_overtime != 1) && (k_mb_overtime != 2) && (k_mb_overtime != 3) && (k_mb_overtime != SD_GOLDEN_FRAG)))
 	{
 		EndMatch(0);
 
@@ -567,8 +567,8 @@ void CheckOvertime(void)
 			|| ((isTeam() || isCTF()) && (teams == 2) && (players > 1))) // Handle a 2v2 or above team game or 1v1 CTF
 	{
 		if (((k_mb_overtime == 3) && abs(sc) > 1) // tie-break overtime allowed with one frag difference (c) ktpro
-			|| ((k_mb_overtime != 3) && abs(sc) > 0) // time based or sudden death overtime allowed with zero frag difference
-			|| k_mb_overtime == SD_GOLDEN_FRAG) // golden frag sudden death always allowed when enabled
+			|| (k_mb_overtime != 3 && k_mb_overtime != SD_GOLDEN_FRAG && abs(sc) > 0)) // time based
+				//or sudden death overtime not including golden frag allowed with zero frag difference
 		{
 			k_mb_overtime = 0;
 		}
@@ -1710,6 +1710,10 @@ void PrintCountdown(int seconds)
 			ot = va("%s %s", dig3(tiecount()), redtext("tb"));
 			break;
 
+		case SD_GOLDEN_FRAG:
+			ot = va("gold");
+			break;
+
 		default:
 			ot = redtext("Unkn");
 			break;