stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-16 09:42:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Force the display of FREE PLAY on the pre-rankingsmode part of the intermission screen, since it's important to show what it was. When in rankingsmode, THAT'S when it's able to freely change with the number of players jumping in and out.

Browse source
This commit is contained in:
toaster 2018-07-22 17:39:09 +01:00
parent 7564aa466e
commit b4a0e0a83f
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/y_inter.c
View file

@ -262,6 +262,7 @@ static void Y_CalculateMatchData(boolean rankingsmode, void (*comparison)(INT32)
// //
void Y_IntermissionDrawer(void) void Y_IntermissionDrawer(void)
{ {
boolean forcefreeplay = false;
INT32 i, whiteplayer = MAXPLAYERS, x = 4, hilicol = V_YELLOWMAP; // fallback INT32 i, whiteplayer = MAXPLAYERS, x = 4, hilicol = V_YELLOWMAP; // fallback
if (intertype == int_none || rendermode == render_none) if (intertype == int_none || rendermode == render_none)
@ -363,7 +364,16 @@ void Y_IntermissionDrawer(void)
{ {
INT32 y = 48; INT32 y = 48;
char name[MAXPLAYERNAME+1]; char name[MAXPLAYERNAME+1];
const char *timeheader = (data.match.rankingsmode ? "RANK" : (intertype == int_race ? "TIME" : "SCORE")); const char *timeheader;
if (data.match.rankingsmode)
timeheader = "RANK";
else
{
timeheader = (intertype == int_race ? "TIME" : "SCORE");
if (data.match.numplayers <= 1)
forcefreeplay = true;
}
// draw the level name // draw the level name
V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 20, 0, data.match.levelstring); V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 20, 0, data.match.levelstring);
@ -484,13 +494,18 @@ dotimer:
if (netgame) // FREE PLAY? if (netgame) // FREE PLAY?
{ {
// check to see if there's anyone else at all i = MAXPLAYERS;
for (i = 0; i < MAXPLAYERS; i++)
if (!forcefreeplay)
{ {
if (i == consoleplayer) // check to see if there's anyone else at all
continue; for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && !stplyr->spectator) {
break; if (i == consoleplayer)
continue;
if (playeringame[i] && !stplyr->spectator)
break;
}
} }
if (i == MAXPLAYERS) if (i == MAXPLAYERS)