mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2025-01-14 05:41:02 +00:00
Merge branch 'do-not-disturb-console' into 'master'
Keep console open in certain instances See merge request STJr/SRB2!480
This commit is contained in:
commit
2966c99fd8
2 changed files with 2 additions and 6 deletions
|
@ -726,7 +726,6 @@ void D_StartTitle(void)
|
||||||
paused = false;
|
paused = false;
|
||||||
advancedemo = false;
|
advancedemo = false;
|
||||||
F_StartTitleScreen();
|
F_StartTitleScreen();
|
||||||
CON_ToggleOff();
|
|
||||||
|
|
||||||
// Reset the palette
|
// Reset the palette
|
||||||
if (rendermode != render_none)
|
if (rendermode != render_none)
|
||||||
|
@ -1396,13 +1395,13 @@ void D_SRB2Main(void)
|
||||||
}
|
}
|
||||||
else if (M_CheckParm("-skipintro"))
|
else if (M_CheckParm("-skipintro"))
|
||||||
{
|
{
|
||||||
CON_ToggleOff();
|
|
||||||
CON_ClearHUD();
|
|
||||||
F_StartTitleScreen();
|
F_StartTitleScreen();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
F_StartIntro(); // Tails 03-03-2002
|
F_StartIntro(); // Tails 03-03-2002
|
||||||
|
|
||||||
|
CON_ToggleOff();
|
||||||
|
|
||||||
if (dedicated && server)
|
if (dedicated && server)
|
||||||
{
|
{
|
||||||
pagename = "TITLESKY";
|
pagename = "TITLESKY";
|
||||||
|
|
|
@ -1831,9 +1831,6 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
|
||||||
CONS_Printf(M_GetText("Speeding off to level...\n"));
|
CONS_Printf(M_GetText("Speeding off to level...\n"));
|
||||||
}
|
}
|
||||||
|
|
||||||
CON_ToggleOff();
|
|
||||||
CON_ClearHUD();
|
|
||||||
|
|
||||||
if (demoplayback && !timingdemo)
|
if (demoplayback && !timingdemo)
|
||||||
precache = false;
|
precache = false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue