From be9adc3883ff44658dd56b26817154ac1da058a9 Mon Sep 17 00:00:00 2001
From: Lugent <35547583+Lugent@users.noreply.github.com>
Date: Sat, 18 Jan 2025 17:05:17 -0400
Subject: [PATCH 1/2] Fix it team scoreboard properly
---
src/y_inter.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/y_inter.c b/src/y_inter.c
index 331a3da386..1622f66528 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1623,6 +1623,7 @@ static void Y_CalculateMatchWinners(void)
boolean completed[MAXPLAYERS];
// Initialize variables
+ memset(data.match.ctfteam, 0, sizeof (data.match.ctfteam));
memset(data.match.scores, 0, sizeof (data.match.scores));
memset(data.match.color, 0, sizeof (data.match.color));
memset(data.match.character, 0, sizeof (data.match.character));
@@ -1643,8 +1644,12 @@ static void Y_CalculateMatchWinners(void)
if (players[i].score >= data.match.scores[data.match.numplayers] && completed[i] == false)
{
+ data.match.ctfteam[data.match.numplayers] = players[i].ctfteam;
data.match.scores[data.match.numplayers] = players[i].score;
data.match.color[data.match.numplayers] = &players[i].skincolor;
+ if (data.match.ctfteam[data.match.numplayers] == 1) { data.match.color[data.match.numplayers] = &skincolor_redteam; } // red team
+ else if (data.match.ctfteam[data.match.numplayers] == 2) { data.match.color[data.match.numplayers] = &skincolor_blueteam; } // blue team
+
data.match.character[data.match.numplayers] = &players[i].skin;
data.match.name[data.match.numplayers] = player_names[i];
data.match.spectator[data.match.numplayers] = players[i].spectator;
@@ -1688,7 +1693,6 @@ static void Y_CalculateTimeRaceWinners(void)
if (players[i].realtime <= data.match.scores[data.match.numplayers] && completed[i] == false)
{
- data.match.ctfteam[data.match.numplayers] = players[i].ctfteam;
data.match.scores[data.match.numplayers] = players[i].realtime;
data.match.color[data.match.numplayers] = &players[i].skincolor;
data.match.character[data.match.numplayers] = &players[i].skin;
--
GitLab
From 3e4df506d0338ca6d7a2ffa86db3fa942fc63a27 Mon Sep 17 00:00:00 2001
From: Lugent <35547583+Lugent@users.noreply.github.com>
Date: Sat, 18 Jan 2025 17:22:37 -0400
Subject: [PATCH 2/2] Better formatting
---
src/y_inter.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/y_inter.c b/src/y_inter.c
index 1622f66528..e9905f1de8 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1647,8 +1647,11 @@ static void Y_CalculateMatchWinners(void)
data.match.ctfteam[data.match.numplayers] = players[i].ctfteam;
data.match.scores[data.match.numplayers] = players[i].score;
data.match.color[data.match.numplayers] = &players[i].skincolor;
- if (data.match.ctfteam[data.match.numplayers] == 1) { data.match.color[data.match.numplayers] = &skincolor_redteam; } // red team
- else if (data.match.ctfteam[data.match.numplayers] == 2) { data.match.color[data.match.numplayers] = &skincolor_blueteam; } // blue team
+ if (data.match.ctfteam[data.match.numplayers] == 1) // red team
+ data.match.color[data.match.numplayers] = &skincolor_redteam;
+
+ if (data.match.ctfteam[data.match.numplayers] == 2) // blue team
+ data.match.color[data.match.numplayers] = &skincolor_blueteam;
data.match.character[data.match.numplayers] = &players[i].skin;
data.match.name[data.match.numplayers] = player_names[i];
--
GitLab