lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Record attack tab-HUD tweaks. 

* Do not subtract a life when retrying if you have infinite lives.
This commit is contained in:
toaster 2018-06-13 17:52:23 +01:00
parent e39bbab532
commit 522fccaf2e
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_game.c
View File

@ -1893,7 +1893,7 @@ void G_Ticker(boolean run)
G_ClearRetryFlag(); G_ClearRetryFlag();
// Costs a life to retry ... unless the player in question is dead already. // Costs a life to retry ... unless the player in question is dead already.
if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE) if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE && players[consoleplayer].lives != 0x7f)
players[consoleplayer].lives -= 1; players[consoleplayer].lives -= 1;
G_DoReborn(consoleplayer); G_DoReborn(consoleplayer);

20
src/hu_stuff.c
View File

@ -1029,25 +1029,29 @@ UINT16 hu_demorings;
static void HU_DrawDemoInfo(void) static void HU_DrawDemoInfo(void)
{ {
V_DrawString(4, 188-24, V_YELLOWMAP, va(M_GetText("%s's replay"), player_names[0])); INT32 h = 188;
if (modeattacking == ATTACKING_NIGHTS)
h -= 12;
V_DrawString(4, h-24, V_YELLOWMAP|V_ALLOWLOWERCASE, va(M_GetText("%s's replay"), player_names[0]));
if (modeattacking) if (modeattacking)
{ {
V_DrawString(4, 188-16, V_YELLOWMAP|V_MONOSPACE, "SCORE:"); V_DrawString(4, h-16, V_YELLOWMAP|V_MONOSPACE, "SCORE:");
V_DrawRightAlignedString(120, 188-16, V_MONOSPACE, va("%d", hu_demoscore)); V_DrawRightAlignedString(120, h-16, V_MONOSPACE, va("%d", hu_demoscore));
V_DrawString(4, 188- 8, V_YELLOWMAP|V_MONOSPACE, "TIME:"); V_DrawString(4, h-8, V_YELLOWMAP|V_MONOSPACE, "TIME:");
if (hu_demotime != UINT32_MAX) if (hu_demotime != UINT32_MAX)
V_DrawRightAlignedString(120, 188- 8, V_MONOSPACE, va("%i:%02i.%02i", V_DrawRightAlignedString(120, h-8, V_MONOSPACE, va("%i:%02i.%02i",
G_TicsToMinutes(hu_demotime,true), G_TicsToMinutes(hu_demotime,true),
G_TicsToSeconds(hu_demotime), G_TicsToSeconds(hu_demotime),
G_TicsToCentiseconds(hu_demotime))); G_TicsToCentiseconds(hu_demotime)));
else else
V_DrawRightAlignedString(120, 188- 8, V_MONOSPACE, "--:--.--"); V_DrawRightAlignedString(120, h-8, V_MONOSPACE, "--:--.--");
if (modeattacking == ATTACKING_RECORD) if (modeattacking == ATTACKING_RECORD)
{ {
V_DrawString(4, 188 , V_YELLOWMAP|V_MONOSPACE, "RINGS:"); V_DrawString(4, h, V_YELLOWMAP|V_MONOSPACE, "RINGS:");
V_DrawRightAlignedString(120, 188 , V_MONOSPACE, va("%d", hu_demorings)); V_DrawRightAlignedString(120, h, V_MONOSPACE, va("%d", hu_demorings));
} }
} }
} }

2
src/st_stuff.c
View File

@ -2393,7 +2393,7 @@ static void ST_overlayDrawer(void)
) )
ST_drawTextHUD(); ST_drawTextHUD();
if (modeattacking) if (modeattacking && !hu_showscores)
ST_drawInput(); ST_drawInput();
ST_drawDebugInfo(); ST_drawDebugInfo();