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

Improve retrying text presentation.

Browse source 
* Now reads "HOLD TO RETRY...".
* Behind the white flash.
* Shows on button tap for about half a second.
This commit is contained in:
toaster 2018-06-14 14:41:14 +01:00
parent 62927bbb76
commit a3f7e07e4d
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_game.c
View file

@ -1827,7 +1827,9 @@ boolean G_Responder(event_t *ev)
if (menuactive || pausedelay < 0 || leveltime < 2) if (menuactive || pausedelay < 0 || leveltime < 2)
return true; return true;
if (++pausedelay > (NEWTICRATE/3)) if (pausedelay < 1+(NEWTICRATE/2))
pausedelay = 1+(NEWTICRATE/2);
else if (++pausedelay > 1+(NEWTICRATE/2)+(NEWTICRATE/3))
{ {
pausedelay = INT32_MIN; pausedelay = INT32_MIN;
G_SetRetryFlag(); G_SetRetryFlag();

18
src/hu_stuff.c
View file

@ -1121,16 +1121,11 @@ void HU_Drawer(void)
V_DrawCenteredString(BASEVIDWIDTH/2, 180, V_YELLOWMAP | V_ALLOWLOWERCASE, resynch_text); V_DrawCenteredString(BASEVIDWIDTH/2, 180, V_YELLOWMAP | V_ALLOWLOWERCASE, resynch_text);
} }
if (modeattacking && pausedelay > 1) if (modeattacking && pausedelay > 0)
{ {
UINT8 strength = (pausedelay*10)/(NEWTICRATE/3); INT32 strength = ((pausedelay - 1 - NEWTICRATE/2)*10)/(NEWTICRATE/3);
INT32 y = hudinfo[HUD_LIVES].y - 13; INT32 y = hudinfo[HUD_LIVES].y - 13;
if (strength > 9)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 0);
else if (strength)
V_DrawFadeScreen(0, strength);
if (players[consoleplayer].powers[pw_carry] == CR_NIGHTSMODE) if (players[consoleplayer].powers[pw_carry] == CR_NIGHTSMODE)
y -= 16; y -= 16;
else else
@ -1141,7 +1136,14 @@ void HU_Drawer(void)
y -= 8; y -= 8;
} }
V_DrawThinString(hudinfo[HUD_LIVES].x-2, y, hudinfo[HUD_LIVES].f|((leveltime & 2) ? V_SKYMAP : V_BLUEMAP), "RETRYING..."); V_DrawThinString(hudinfo[HUD_LIVES].x-2, y,
hudinfo[HUD_LIVES].f|((leveltime & 4) ? V_SKYMAP : V_BLUEMAP),
"HOLD TO RETRY...");
if (strength > 9)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 0);
else if (strength > 0)
V_DrawFadeScreen(0, strength);
} }
} }