stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-23 12:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-console-dedicated-windows' into 'next'

Browse source 
Fix command prompt issues on dedicated build on Windows

Closes #1290

See merge request STJr/SRB2!2518
This commit is contained in:
Lactozilla 2024-09-28 21:37:13 +00:00
commit 68f40d8a64
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/dedicated/i_system.c
View file

@ -999,20 +999,8 @@ static void I_GetConsoleEvents(void)
static void I_StartupConsole(void) static void I_StartupConsole(void)
{ {
HANDLE ci, co; HANDLE ci, co;
const INT32 ded = M_CheckParm("-dedicated"); BOOL gotConsole = AllocConsole();
BOOL gotConsole = FALSE; consolevent = !M_CheckParm("-noconsole");
if (M_CheckParm("-console") || ded)
gotConsole = AllocConsole();
#ifdef _DEBUG
else if (M_CheckParm("-noconsole") && !ded)
#else
else if (!M_CheckParm("-console") && !ded)
#endif
{
FreeConsole();
gotConsole = FALSE;
}
if (gotConsole) if (gotConsole)
{ {
SetConsoleTitleA("SRB2 Console"); SetConsoleTitleA("SRB2 Console");
@ -1040,12 +1028,7 @@ static inline void I_ShutdownConsole(void){}
static void I_GetConsoleEvents(void){} static void I_GetConsoleEvents(void){}
static inline void I_StartupConsole(void) static inline void I_StartupConsole(void)
{ {
#ifdef _DEBUG
consolevent = !M_CheckParm("-noconsole"); consolevent = !M_CheckParm("-noconsole");
#else
consolevent = M_CheckParm("-console");
#endif
framebuffer = M_CheckParm("-framebuffer"); framebuffer = M_CheckParm("-framebuffer");
if (framebuffer) if (framebuffer)