Correct some minor deficiencies in the hold-for-retry system in record attack.
This commit is contained in:
parent
59d617d31f
commit
f0618d5780
|
@ -1831,7 +1831,6 @@ boolean G_Responder(event_t *ev)
|
||||||
pausedelay = 1+(NEWTICRATE/2);
|
pausedelay = 1+(NEWTICRATE/2);
|
||||||
else if (++pausedelay > 1+(NEWTICRATE/2)+(NEWTICRATE/3))
|
else if (++pausedelay > 1+(NEWTICRATE/2)+(NEWTICRATE/3))
|
||||||
{
|
{
|
||||||
pausedelay = INT32_MIN;
|
|
||||||
G_SetRetryFlag();
|
G_SetRetryFlag();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1908,7 +1907,10 @@ void G_Ticker(boolean run)
|
||||||
G_ClearRetryFlag();
|
G_ClearRetryFlag();
|
||||||
|
|
||||||
if (modeattacking)
|
if (modeattacking)
|
||||||
|
{
|
||||||
|
pausedelay = INT32_MIN;
|
||||||
M_ModeAttackRetry(0);
|
M_ModeAttackRetry(0);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// 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.
|
||||||
|
|
|
@ -2734,7 +2734,7 @@ boolean P_SetupLevel(boolean skipprecip)
|
||||||
|
|
||||||
// Special stage fade to white
|
// Special stage fade to white
|
||||||
// This is handled BEFORE sounds are stopped.
|
// This is handled BEFORE sounds are stopped.
|
||||||
if (modeattacking && pausedelay == INT32_MIN)
|
if (modeattacking && !demoplayback && (pausedelay == INT32_MIN))
|
||||||
ranspecialwipe = 2;
|
ranspecialwipe = 2;
|
||||||
else if (rendermode != render_none && G_IsSpecialStage(gamemap))
|
else if (rendermode != render_none && G_IsSpecialStage(gamemap))
|
||||||
{
|
{
|
||||||
|
@ -2788,7 +2788,7 @@ boolean P_SetupLevel(boolean skipprecip)
|
||||||
|
|
||||||
if (ranspecialwipe == 2)
|
if (ranspecialwipe == 2)
|
||||||
{
|
{
|
||||||
pausedelay = -NEWTICRATE;
|
pausedelay = -3; // preticker plus one
|
||||||
S_StartSound(NULL, sfx_s3k73);
|
S_StartSound(NULL, sfx_s3k73);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue