zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-12 23:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

- only go from menu to console when closing with Escape.

Browse source
This commit is contained in:
Christoph Oelckers 2020-08-23 21:24:31 +02:00
parent c0da85d0ff
commit 4469cf7edb
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/menu/menu.cpp
View file

@ -208,6 +208,7 @@ bool DMenu::MenuEvent (int mkey, bool fromcontroller)
{ {
M_MenuSound(CurrentMenu->mParentMenu? BackSound : CloseSound); M_MenuSound(CurrentMenu->mParentMenu? BackSound : CloseSound);
Close(); Close();
if (!CurrentMenu && gamestate == GS_MENUSCREEN) C_FullConsole();
return true; return true;
} }
} }
@ -964,7 +965,6 @@ void M_ClearMenus (bool final)
if (!final) if (!final)
{ {
gi->MenuClosed(); gi->MenuClosed();
if (gamestate == GS_MENUSCREEN) C_FullConsole();
} }
} }

7
source/sw/src/save.cpp
View file

@ -693,6 +693,13 @@ bool GameInterface::LoadGame(FSaveGameNode* sv)
//MREAD(Player,sizeof(PLAYER), numplayers,fil); //MREAD(Player,sizeof(PLAYER), numplayers,fil);
//save players info //save players info
for (auto& pp : Player)
{
pp.cookieTime = 0;
memset(pp.cookieQuote, 0, sizeof(pp.cookieQuote));
}
for (i = 0; i < numplayers; i++) for (i = 0; i < numplayers; i++)
{ {
pp = &Player[i]; pp = &Player[i];