incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Single player menu should only occur in Grandprix and add lives logic

Browse source
This commit is contained in:
NepDisk 2026-03-29 07:59:45 -04:00
parent f2a0789189
commit 5cf04f9df4
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.c
View file

@ -4154,7 +4154,7 @@ void G_FinishExitLevel(void)
// Back to the menu with you.
D_QuitNetGame();
CL_Reset();
M_StartControlPanel();
D_StartTitle();
return;
}
}

19
src/m_menu.c
View file

@ -1895,10 +1895,23 @@ void M_StartControlPanel(void)
M_EnterMenu(MN_MAPAUSE, true, 0);
M_SetItemOn(MN_MAPAUSE, "CONTINUE");
}
else if (!(netgame || multiplayer)) // Single Player
else if (grandprixinfo.gp) // Single Player
{
boolean retryallowed = false;
INT32 i;
for (i = 0; i <= splitscreen; i++)
{
if (G_GametypeUsesLives() && players[g_localplayers[i]].lives <= 1)
continue;
retryallowed = true;
break;
}
if (gamestate != GS_LEVEL)
retryallowed = false;
// intermission, so gray out stuff.
M_SetItemDisabled(MN_SPAUSE, "RETRY", gamestate != GS_LEVEL /*|| ultimatemode*/);
M_SetItemDisabled(MN_SPAUSE, "RETRY", !retryallowed /*|| ultimatemode*/);
M_EnterMenu(MN_SPAUSE, true, 0);
M_SetItemOn(MN_SPAUSE, "CONTINUE");
@ -5587,7 +5600,7 @@ static void M_RetryResponse(INT32 ch)
if (ch != 'y' && ch != KEY_ENTER)
return;
if (netgame || multiplayer) // Should never happen!
if (netgame) // Should never happen!
return;
M_ClearMenus(true);