Lephenixnoir
/
CGDoom
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Restore main menu upon loading

This commit is contained in:
Lephenixnoir 2021-09-10 22:19:53 +02:00
parent f5a8bb90f1
commit aa0f58325c
Signed by: Lephenixnoir
GPG Key ID: 1BBA026E13FC0495
2 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
cgdoom/d_main.c
View File

@ -198,6 +198,10 @@ void D_Display (void)
if (gamestate == GS_LEVEL && gametic)
HU_Drawer ();
// clean up border stuff
if (gamestate != oldgamestate && gamestate != GS_LEVEL)
I_SetPalette ((byte *)W_CacheLumpNameConst ("PLAYPAL", PU_CACHE));
menuactivestate = menuactive;
viewactivestate = viewactive;
inhelpscreensstate = inhelpscreens;
@ -332,12 +336,51 @@ int skill = 2;
//
void D_DoAdvanceDemo (void)
{
pagename = "TITLEPIC";
gamestate= GS_LEVEL;
G_DeferedInitNew((skill_t)skill,episode,map);
advancedemo= false;
}
players[consoleplayer].playerstate = PST_LIVE; // not reborn
advancedemo = false;
usergame = false; // no save / end game here
paused = false;
gameaction = ga_nothing;
if ( gamemode == retail )
demosequence = (demosequence+1)%3;
else
demosequence = (demosequence+1)%2;
switch (demosequence)
{
case 0:
if ( gamemode == commercial )
pagetic = 35 * 11;
else
pagetic = 170;
gamestate = GS_DEMOSCREEN;
pagename = "TITLEPIC";
break;
case 1:
pagetic = 200;
gamestate = GS_DEMOSCREEN;
pagename = "CREDIT";
break;
case 2:
gamestate = GS_DEMOSCREEN;
if ( gamemode == commercial)
{
pagetic = 35 * 11;
pagename = "TITLEPIC";
}
else
{
pagetic = 200;
if ( gamemode == retail )
pagename = "CREDIT";
else
pagename = "HELP2";
}
break;
}
}
//

3
cgdoom/g_game.c
View File

@ -458,6 +458,9 @@ void G_Ticker (void)
case ga_savegame:
G_DoSaveGame ();
break;
case ga_playdemo:
/* CGDoom: Main menu demo is disabled (code removed) */
break;
case ga_completed:
G_DoCompleted ();
break;