mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-31 05:30:48 +00:00
Oops, forgot the commit.
This commit is contained in:
parent
1bb51b0ed3
commit
3d6d53a926
1 changed files with 4 additions and 2 deletions
|
@ -109,6 +109,7 @@ typedef union
|
||||||
UINT16 *color[MAXPLAYERS]; // Winner's color #
|
UINT16 *color[MAXPLAYERS]; // Winner's color #
|
||||||
boolean spectator[MAXPLAYERS]; // Spectator list
|
boolean spectator[MAXPLAYERS]; // Spectator list
|
||||||
UINT8 *character[MAXPLAYERS]; // Winner's character #
|
UINT8 *character[MAXPLAYERS]; // Winner's character #
|
||||||
|
INT32 ctfteam[MAXPLAYERS]; // Winner's ctfteam #
|
||||||
INT32 num[MAXPLAYERS]; // Winner's player #
|
INT32 num[MAXPLAYERS]; // Winner's player #
|
||||||
char *name[MAXPLAYERS]; // Winner's name
|
char *name[MAXPLAYERS]; // Winner's name
|
||||||
patch_t *result; // RESULT
|
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);
|
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)
|
if (redplayers++ > 9)
|
||||||
continue;
|
continue;
|
||||||
|
@ -857,7 +858,7 @@ void Y_IntermissionDrawer(void)
|
||||||
y = (redplayers * 16) + 32;
|
y = (redplayers * 16) + 32;
|
||||||
V_DrawCenteredString(x+6, y, 0, va("%d", redplayers));
|
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)
|
if (blueplayers++ > 9)
|
||||||
continue;
|
continue;
|
||||||
|
@ -1687,6 +1688,7 @@ static void Y_CalculateTimeRaceWinners(void)
|
||||||
|
|
||||||
if (players[i].realtime <= data.match.scores[data.match.numplayers] && completed[i] == false)
|
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.scores[data.match.numplayers] = players[i].realtime;
|
||||||
data.match.color[data.match.numplayers] = &players[i].skincolor;
|
data.match.color[data.match.numplayers] = &players[i].skincolor;
|
||||||
data.match.character[data.match.numplayers] = &players[i].skin;
|
data.match.character[data.match.numplayers] = &players[i].skin;
|
||||||
|
|
Loading…
Reference in a new issue