stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 05:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update end tally and sound test to accomodate new title font.

Browse source
This commit is contained in:
toaster 2019-11-17 14:56:05 +00:00
parent 5dc494da16
commit 76897b560f
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/m_menu.c
View file

@ -7175,7 +7175,7 @@ static void M_DrawSoundTest(void)
titl = va("%s - ", curplaying->title); titl = va("%s - ", curplaying->title);
} }
else else
titl = "NONE - "; titl = "None - ";
i = V_LevelNameWidth(titl); i = V_LevelNameWidth(titl);
@ -7189,7 +7189,7 @@ static void M_DrawSoundTest(void)
while (x > y) while (x > y)
{ {
x -= i; x -= i;
V_DrawLevelTitle(x, 24, 0, titl); V_DrawLevelTitle(x, 22, 0, titl);
} }
if (curplaying) if (curplaying)

28
src/y_inter.c
View file

@ -399,10 +399,10 @@ void Y_IntermissionDrawer(void)
// draw the "got through act" lines and act number // draw the "got through act" lines and act number
V_DrawLevelTitle(data.coop.passedx1, 49, 0, data.coop.passed1); V_DrawLevelTitle(data.coop.passedx1, 49, 0, data.coop.passed1);
V_DrawLevelTitle(data.coop.passedx2, 49+V_LevelNameHeight(data.coop.passed2)+2, 0, data.coop.passed2); V_DrawLevelTitle(data.coop.passedx2, 49+V_LevelNameHeight(data.coop.passed1)+2, 0, data.coop.passed2);
if (data.coop.actnum) if (data.coop.actnum)
V_DrawLevelActNum(244, 57, 0, data.coop.actnum); V_DrawLevelActNum(244, 58, 0, data.coop.actnum);
bonusy = 150; bonusy = 150;
// Total // Total
@ -1384,21 +1384,21 @@ void Y_StartIntermission(void)
// too long so just show "YOU GOT THROUGH THE ACT" // too long so just show "YOU GOT THROUGH THE ACT"
if (strlen(skins[players[consoleplayer].skin].realname) > 13) if (strlen(skins[players[consoleplayer].skin].realname) > 13)
{ {
strcpy(data.coop.passed1, "YOU GOT"); strcpy(data.coop.passed1, "you got");
strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "THROUGH ACT" : "THROUGH THE ACT"); strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "through act" : "through the act");
} }
// long enough that "X GOT" won't fit so use "X PASSED THE ACT" // long enough that "X GOT" won't fit so use "X PASSED THE ACT"
else if (strlen(skins[players[consoleplayer].skin].realname) > 8) else if (strlen(skins[players[consoleplayer].skin].realname) > 8)
{ {
strcpy(data.coop.passed1, skins[players[consoleplayer].skin].realname); strcpy(data.coop.passed1, skins[players[consoleplayer].skin].realname);
strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "PASSED ACT" : "PASSED THE ACT"); strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "passed act" : "passed the act");
} }
// length is okay for normal use // length is okay for normal use
else else
{ {
snprintf(data.coop.passed1, sizeof data.coop.passed1, "%s GOT", snprintf(data.coop.passed1, sizeof data.coop.passed1, "%s got",
skins[players[consoleplayer].skin].realname); skins[players[consoleplayer].skin].realname);
strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "THROUGH ACT" : "THROUGH THE ACT"); strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "through act" : "through the act");
} }
// set X positions // set X positions
@ -1498,7 +1498,7 @@ void Y_StartIntermission(void)
// set up the "got through act" message according to skin name // set up the "got through act" message according to skin name
if (stagefailed) if (stagefailed)
{ {
strcpy(data.spec.passed2, "SPECIAL STAGE"); strcpy(data.spec.passed2, "Special Stage");
data.spec.passed1[0] = '\0'; data.spec.passed1[0] = '\0';
} }
else if (ALL7EMERALDS(emeralds)) else if (ALL7EMERALDS(emeralds))
@ -1507,13 +1507,13 @@ void Y_StartIntermission(void)
sizeof data.spec.passed1, "%s", sizeof data.spec.passed1, "%s",
skins[players[consoleplayer].skin].realname); skins[players[consoleplayer].skin].realname);
data.spec.passed1[sizeof data.spec.passed1 - 1] = '\0'; data.spec.passed1[sizeof data.spec.passed1 - 1] = '\0';
strcpy(data.spec.passed2, "GOT THEM ALL!"); strcpy(data.spec.passed2, "got them all!");
if (players[consoleplayer].charflags & SF_SUPER) if (players[consoleplayer].charflags & SF_SUPER)
{ {
strcpy(data.spec.passed3, "CAN NOW BECOME"); strcpy(data.spec.passed3, "can now become");
snprintf(data.spec.passed4, snprintf(data.spec.passed4,
sizeof data.spec.passed4, "SUPER %s", sizeof data.spec.passed4, "Super %s",
skins[players[consoleplayer].skin].realname); skins[players[consoleplayer].skin].realname);
data.spec.passed4[sizeof data.spec.passed4 - 1] = '\0'; data.spec.passed4[sizeof data.spec.passed4 - 1] = '\0';
} }
@ -1523,13 +1523,13 @@ void Y_StartIntermission(void)
if (strlen(skins[players[consoleplayer].skin].realname) <= SKINNAMESIZE-5) if (strlen(skins[players[consoleplayer].skin].realname) <= SKINNAMESIZE-5)
{ {
snprintf(data.spec.passed1, snprintf(data.spec.passed1,
sizeof data.spec.passed1, "%s GOT", sizeof data.spec.passed1, "%s got",
skins[players[consoleplayer].skin].realname); skins[players[consoleplayer].skin].realname);
data.spec.passed1[sizeof data.spec.passed1 - 1] = '\0'; data.spec.passed1[sizeof data.spec.passed1 - 1] = '\0';
} }
else else
strcpy(data.spec.passed1, "YOU GOT"); strcpy(data.spec.passed1, "You got");
strcpy(data.spec.passed2, "A CHAOS EMERALD"); strcpy(data.spec.passed2, "a Chaos Emerald");
if (P_GetNextEmerald() > 6) if (P_GetNextEmerald() > 6)
{ {
data.spec.passed2[15] = '?'; data.spec.passed2[15] = '?';