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

- wrap Blood's main loop into an exception handler for recoverable errors.

Browse source
This commit is contained in:
Christoph Oelckers 2020-08-16 20:04:27 +02:00
parent 01d9bde7f4
commit 57efb26567
1 changed files with 52 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
source/blood/src/blood.cpp
View file

@ -916,52 +916,64 @@ int GameInterface::app_main()
bool playvideo = !bQuickStart;
while (true)
{
if (gamestate == GS_STARTUP) gameInit();
commonTicker(playvideo);
netGetPackets();
handleevents();
updatePauseStatus();
D_ProcessEvents();
ctrlGetInput();
switch (gamestate)
try
{
default:
case GS_STARTUP:
if (playvideo) playlogos();
else
{
gamestate = GS_MENUSCREEN;
M_StartControlPanel(false);
M_SetMenu(NAME_Mainmenu);
}
break;
if (gamestate == GS_STARTUP) gameInit();
case GS_MENUSCREEN:
case GS_FULLCONSOLE:
drawBackground();
break;
commonTicker(playvideo);
netGetPackets();
handleevents();
updatePauseStatus();
D_ProcessEvents();
ctrlGetInput();
case GS_INTRO:
case GS_INTERMISSION:
RunScreenJobFrame(); // This handles continuation through its completion callback.
break;
switch (gamestate)
{
default:
case GS_STARTUP:
if (userConfig.CommandMap.IsNotEmpty())
{
}
else
{
if (playvideo) playlogos();
else
{
gamestate = GS_MENUSCREEN;
M_StartControlPanel(false);
M_SetMenu(NAME_Mainmenu);
}
}
break;
case GS_LEVEL:
gameTicker();
LocalKeys();
break;
case GS_MENUSCREEN:
case GS_FULLCONSOLE:
drawBackground();
break;
case GS_FINALE:
gEndGameMgr.ProcessKeys();
gEndGameMgr.Draw();
break;
case GS_INTRO:
case GS_INTERMISSION:
RunScreenJobFrame(); // This handles continuation through its completion callback.
break;
case GS_LEVEL:
gameTicker();
LocalKeys();
break;
case GS_FINALE:
gEndGameMgr.ProcessKeys();
gEndGameMgr.Draw();
break;
}
videoNextPage();
}
catch (CRecoverableError& err)
{
C_FullConsole();
Printf(TEXTCOLOR_RED "%s\n", err.what());
}
videoNextPage();
}
return 0;
}