From 3d6d53a9267673e99ad9edbe2643d5feeb0d933a Mon Sep 17 00:00:00 2001
From: Lugent <35547583+Lugent@users.noreply.github.com>
Date: Sun, 12 Jan 2025 00:54:27 -0400
Subject: [PATCH] Oops, forgot the commit.
---
src/y_inter.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/y_inter.c b/src/y_inter.c
index 95a08a3871..e67e89b8b6 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -109,6 +109,7 @@ typedef union
UINT16 *color[MAXPLAYERS]; // Winner's color #
boolean spectator[MAXPLAYERS]; // Spectator list
UINT8 *character[MAXPLAYERS]; // Winner's character #
+ INT32 ctfteam[MAXPLAYERS]; // Winner's ctfteam #
INT32 num[MAXPLAYERS]; // Winner's player #
char *name[MAXPLAYERS]; // Winner's name
patch_t *result; // RESULT
@@ -849,7 +850,7 @@ void Y_IntermissionDrawer(void)
{
UINT8 *colormap = R_GetTranslationColormap(*data.match.character[i], *data.match.color[i], GTC_CACHE);
- if (*data.match.color[i] == SKINCOLOR_RED) //red
+ if (data.match.ctfteam[i] == 1) //red
{
if (redplayers++ > 9)
continue;
@@ -857,7 +858,7 @@ void Y_IntermissionDrawer(void)
y = (redplayers * 16) + 32;
V_DrawCenteredString(x+6, y, 0, va("%d", redplayers));
}
- else if (*data.match.color[i] == SKINCOLOR_BLUE) //blue
+ else if (data.match.ctfteam[i] == 2) //blue
{
if (blueplayers++ > 9)
continue;
@@ -1687,6 +1688,7 @@ 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