vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve intermission drawer further.

Browse source 
* Change `MM:SS.MS` to `MM'SS"MS' to match all other recorded instances of time in-game.
* Add a full stop to NO CONTEST to scrounge up an extra four pixels to match the increased width of above.
* Make it such that the number of players per column will never be desynced with future code changes by tying it to a local #define.
* Other minor code improvements.
This commit is contained in:
toaster 2018-08-31 12:37:15 +01:00
parent bd7e0e75f0
commit a7bb16ada9
1 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/y_inter.c
View file

@ -413,7 +413,8 @@ void Y_IntermissionDrawer(void)
} }
else*/ if (intertype == int_race || intertype == int_match) else*/ if (intertype == int_race || intertype == int_match)
{ {
INT32 y = 48; #define NUMFORNEWCOLUMN 8
INT32 y = 48, gutter = ((data.match.numplayers > NUMFORNEWCOLUMN) ? 0 : (BASEVIDWIDTH/2));
const char *timeheader; const char *timeheader;
if (data.match.rankingsmode) if (data.match.rankingsmode)
@ -428,7 +429,7 @@ void Y_IntermissionDrawer(void)
if (data.match.encore) if (data.match.encore)
V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 20-8, hilicol, "ENCORE MODE"); V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 20-8, hilicol, "ENCORE MODE");
if (data.match.numplayers > 8) if (!gutter)
{ {
V_DrawFill(x+156, 32, 1, 152, 0); V_DrawFill(x+156, 32, 1, 152, 0);
@ -465,7 +466,7 @@ void Y_IntermissionDrawer(void)
V_DrawSmallMappedPatch(x+16, y-4, 0,faceprefix[*data.match.character[i]], colormap); V_DrawSmallMappedPatch(x+16, y-4, 0,faceprefix[*data.match.character[i]], colormap);
} }
if (data.match.numplayers > 8) if (!gutter)
strlcpy(strtime, data.match.name[i], 6); strlcpy(strtime, data.match.name[i], 6);
else else
STRBUFCPY(strtime, data.match.name[i]); STRBUFCPY(strtime, data.match.name[i]);
@ -485,48 +486,29 @@ void Y_IntermissionDrawer(void)
else else
snprintf(strtime, sizeof strtime, "(+ %d)", data.match.increase[data.match.num[i]]); snprintf(strtime, sizeof strtime, "(+ %d)", data.match.increase[data.match.num[i]]);
if (data.match.numplayers > 8) V_DrawRightAlignedString(x+120+gutter, y, 0, strtime);
V_DrawRightAlignedString(x+120, y, 0, strtime);
else
V_DrawRightAlignedString(x+120+BASEVIDWIDTH/2, y, 0, strtime);
} }
snprintf(strtime, sizeof strtime, "%d", data.match.val[i]); snprintf(strtime, sizeof strtime, "%d", data.match.val[i]);
if (data.match.numplayers > 8) V_DrawRightAlignedString(x+152+gutter, y, 0, strtime);
V_DrawRightAlignedString(x+152, y, 0, strtime);
else
V_DrawRightAlignedString(x+152+BASEVIDWIDTH/2, y, 0, strtime);
} }
else else
{ {
if (data.match.val[i] == (UINT32_MAX-1)) if (data.match.val[i] == (UINT32_MAX-1))
{ V_DrawRightAlignedThinString(x+152+gutter, y-1, 0, "NO CONTEST.");
if (data.match.numplayers > 8)
V_DrawRightAlignedThinString(x+152, y-1, 0, "NO CONTEST");
else
V_DrawRightAlignedThinString(x+152+BASEVIDWIDTH/2, y-1, 0, "NO CONTEST");
}
else else
{ {
if (intertype == int_race) if (intertype == int_race)
{ {
snprintf(strtime, sizeof strtime, "%i:%02i.%02i", G_TicsToMinutes(data.match.val[i], true), snprintf(strtime, sizeof strtime, "%i'%02i\"%02i", G_TicsToMinutes(data.match.val[i], true),
G_TicsToSeconds(data.match.val[i]), G_TicsToCentiseconds(data.match.val[i])); G_TicsToSeconds(data.match.val[i]), G_TicsToCentiseconds(data.match.val[i]));
strtime[sizeof strtime - 1] = '\0'; strtime[sizeof strtime - 1] = '\0';
if (data.match.numplayers > 8) V_DrawRightAlignedString(x+152+gutter, y, 0, strtime);
V_DrawRightAlignedString(x+152, y, 0, strtime);
else
V_DrawRightAlignedString(x+152+BASEVIDWIDTH/2, y, 0, strtime);
} }
else else
{ V_DrawRightAlignedString(x+152+gutter, y, 0, va("%i", data.match.val[i]));
if (data.match.numplayers > 8)
V_DrawRightAlignedString(x+152, y, 0, va("%i", data.match.val[i]));
else
V_DrawRightAlignedString(x+152+BASEVIDWIDTH/2, y, 0, va("%i", data.match.val[i]));
}
} }
} }
@ -538,11 +520,12 @@ void Y_IntermissionDrawer(void)
y += 16; y += 16;
if (i == 7) if (i == NUMFORNEWCOLUMN-1)
{ {
y = 48; y = 48;
x += BASEVIDWIDTH/2; x += BASEVIDWIDTH/2;
} }
#undef NUMFORNEWCOLUMN
} }
} }