mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2024-12-02 08:51:57 +00:00
Fixed ERR_DROP resulting in a glitched screen with only the console accessible - show the main menu instead.
This commit is contained in:
parent
9e7230de34
commit
2555b804d6
3 changed files with 38 additions and 1 deletions
|
@ -57,6 +57,7 @@ public:
|
|||
virtual bool ProcessEvent( const sysEvent_t* event, bool forceAccept );
|
||||
virtual bool Active();
|
||||
virtual void ClearNotifyLines();
|
||||
virtual void Open();
|
||||
virtual void Close();
|
||||
virtual void Print( const char* text );
|
||||
virtual void Draw( bool forceFullScreen );
|
||||
|
@ -424,6 +425,22 @@ void idConsoleLocal::ClearNotifyLines()
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
================
|
||||
idConsoleLocal::Open
|
||||
================
|
||||
*/
|
||||
void idConsoleLocal::Open()
|
||||
{
|
||||
if( keyCatching )
|
||||
return; // already open
|
||||
|
||||
consoleField.ClearAutoComplete();
|
||||
consoleField.Clear();
|
||||
keyCatching = true;
|
||||
SetDisplayFraction( 0.5f );
|
||||
}
|
||||
|
||||
/*
|
||||
================
|
||||
idConsoleLocal::Close
|
||||
|
|
|
@ -76,6 +76,9 @@ public:
|
|||
// clear the timers on any recent prints that are displayed in the notify lines
|
||||
virtual void ClearNotifyLines() = 0;
|
||||
|
||||
// force console open
|
||||
virtual void Open() = 0;
|
||||
|
||||
// some console commands, like timeDemo, will force the console closed before they start
|
||||
virtual void Close() = 0;
|
||||
|
||||
|
|
|
@ -853,7 +853,24 @@ void idCommonLocal::Frame()
|
|||
}
|
||||
catch( idException& )
|
||||
{
|
||||
return; // an ERP_DROP was thrown
|
||||
// an ERP_DROP was thrown
|
||||
#if defined(USE_DOOMCLASSIC)
|
||||
if( currentGame == DOOM_CLASSIC || currentGame == DOOM2_CLASSIC )
|
||||
{
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
// kill loading gui
|
||||
delete loadGUI;
|
||||
loadGUI = NULL;
|
||||
|
||||
// drop back to main menu
|
||||
LeaveGame();
|
||||
|
||||
// force the console open to show error messages
|
||||
console->Open();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue