stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix warping from SP pause level select breaking if game was started with no save slot (such as from extras menu)

Browse source
This commit is contained in:
Monster Iestyn 2023-08-01 17:52:06 +01:00
parent 1ddc04abc6
commit c9efaf3a1a
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/m_menu.c
View file

@ -7112,8 +7112,22 @@ static void M_LevelSelectWarp(INT32 choice)
fromlevelselect = true;
if (currentMenu == &SP_LevelSelectDef || currentMenu == &SP_PauseLevelSelectDef)
G_LoadGame((UINT32)cursaveslot, startmap); // reload from SP save data: this is needed to keep score/lives/continues from reverting to defaults
else
{
if (cursaveslot > 0) // do we have a save slot to load?
G_LoadGame((UINT32)cursaveslot, startmap); // reload from SP save data: this is needed to keep score/lives/continues from reverting to defaults
else // no save slot, start new game but keep the current skin
{
M_ClearMenus(true);
G_DeferedInitNew(false, G_BuildMapName(startmap), cv_skin.value, false, fromlevelselect); // Not sure about using cv_skin here, but it seems fine in testing.
COM_BufAddText("dummyconsvar 1\n"); // G_DeferedInitNew doesn't do this
if (levelselect.rows)
Z_Free(levelselect.rows);
levelselect.rows = NULL;
}
}
else // start new game
{
cursaveslot = 0;
M_SetupChoosePlayer(0);