From: Martin Taibr <taibr.martin@gmail.com>
Date: Thu, 26 Mar 2020 15:46:07 +0000 (+0100)
Subject: show "and" in scoreboard for leadlimit_and_fraglimit 1
X-Git-Tag: xonotic-v0.8.5~1133^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85801ab70a78db59c0d49a75b429458eb4b5063c;p=xonotic%2Fxonotic-data.pk3dir.git

show "and" in scoreboard for leadlimit_and_fraglimit 1
---

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index a6d1cc941..9bdd22ca5 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1604,19 +1604,17 @@ void Scoreboard_Draw()
 	draw_endBoldFont();
 
 	// Game Info: Game Detail
-	float tl, fl, ll;
-	str = ""; // optionally "^7Limits: "
-	tl = STAT(TIMELIMIT);
-	fl = STAT(FRAGLIMIT);
-	ll = STAT(LEADLIMIT);
+	float tl = STAT(TIMELIMIT);
+	float fl = STAT(FRAGLIMIT);
+	float ll = STAT(LEADLIMIT);
+	float ll_and_fl = STAT(LEADLIMIT_AND_FRAGLIMIT);
+	str = "";
 	if(tl > 0)
 		str = strcat(str, sprintf(_("^3%1.0f minutes"), tl));
 	if(!ISGAMETYPE(LMS))
 	{
 		if(fl > 0)
 		{
-			if(tl > 0)
-				str = strcat(str, "^7 / "); // delimiter
 			if(teamplay)
 			{
 				str = strcat(str, sprintf(_("^5%s %s"), ScoreString(teamscores_flags(ts_primary), fl),
@@ -1634,8 +1632,17 @@ void Scoreboard_Draw()
 		}
 		if(ll > 0)
 		{
+			//if(tl > 0 || fl > 0)
+			//	str = strcat(str, "^7 / "); // delimiter
 			if(tl > 0 || fl > 0)
-				str = strcat(str, "^7 / "); // delimiter
+			{
+				// delimiter
+				if (ll_and_fl)
+					str = strcat(str, "^7 and ");
+				else
+					str = strcat(str, "^7 / ");
+			}
+
 			if(teamplay)
 			{
 				str = strcat(str, sprintf(_("^2+%s %s"), ScoreString(teamscores_flags(ts_primary), ll),
diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index 612e5b6cd..245d92604 100644
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -85,6 +85,7 @@ REGISTER_STAT(NB_METERSTART, float)
 /** compressShotOrigin */
 REGISTER_STAT(SHOTORG, int)
 REGISTER_STAT(LEADLIMIT, float, autocvar_leadlimit)
+REGISTER_STAT(LEADLIMIT_AND_FRAGLIMIT, float, autocvar_leadlimit_and_fraglimit)
 
 REGISTER_STAT(LAST_PICKUP, float)
 REGISTER_STAT(HUD, int)