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

Correct some minor deficiencies in the hold-for-retry system in record attack.

This commit is contained in:
toaster 2018-06-15 21:42:36 +01:00
parent 59d617d31f
commit f0618d5780
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/g_game.c
View File

@ -1831,7 +1831,6 @@ boolean G_Responder(event_t *ev)
pausedelay = 1+(NEWTICRATE/2);
else if (++pausedelay > 1+(NEWTICRATE/2)+(NEWTICRATE/3))
{
pausedelay = INT32_MIN;
G_SetRetryFlag();
return true;
}
@ -1908,7 +1907,10 @@ void G_Ticker(boolean run)
G_ClearRetryFlag();
if (modeattacking)
{
pausedelay = INT32_MIN;
M_ModeAttackRetry(0);
}
else
{
// Costs a life to retry ... unless the player in question is dead already.

4
src/p_setup.c
View File

@ -2734,7 +2734,7 @@ boolean P_SetupLevel(boolean skipprecip)
// Special stage fade to white
// This is handled BEFORE sounds are stopped.
if (modeattacking && pausedelay == INT32_MIN)
if (modeattacking && !demoplayback && (pausedelay == INT32_MIN))
ranspecialwipe = 2;
else if (rendermode != render_none && G_IsSpecialStage(gamemap))
{
@ -2788,7 +2788,7 @@ boolean P_SetupLevel(boolean skipprecip)
if (ranspecialwipe == 2)
{
pausedelay = -NEWTICRATE;
pausedelay = -3; // preticker plus one
S_StartSound(NULL, sfx_s3k73);
}