- moced I_DetectOS call into D_DoomMain

This requires the console and was the reason for this strange setup.

# Conflicts:
#	src/posix/cocoa/i_main.mm
This commit is contained in:
Christoph Oelckers 2019-10-01 01:02:49 +02:00 committed by drfrag
parent 5293b8b281
commit 1f15bc5b0d
4 changed files with 7 additions and 3 deletions

View file

@ -2334,6 +2334,7 @@ void D_DoomMain (void)
const char *batchout = Args->CheckValue("-errorlog");
C_InitConsole(80*8, 25*8, false);
I_DetectOS();
// +logfile gets checked too late to catch the full startup log in the logfile so do some extra check for it here.
FString logfile = Args->TakeValue("+logfile");

View file

@ -76,7 +76,7 @@ void Mac_I_FatalError(const char* const message)
}
static void I_DetectOS()
void I_DetectOS()
{
SInt32 majorVersion = 0;
Gestalt(gestaltSystemVersionMajor, &majorVersion);
@ -158,7 +158,6 @@ void OriginalMainTry(int argc, char** argv)
progdir = [[exePath stringByDeletingLastPathComponent] UTF8String];
progdir += "/";
I_DetectOS();
D_DoomMain();
}

View file

@ -150,6 +150,11 @@ static int DoomSpecificInfo (char *buffer, char *end)
return p;
}
void I_DetectOS()
{
// The POSIX version never implemented this.
}
void I_StartupJoysticks();
void I_ShutdownJoysticks();

View file

@ -999,7 +999,6 @@ void DoMain (HINSTANCE hInstance)
CoInitialize (NULL);
atexit (UnCOM);
I_DetectOS ();
D_DoomMain ();
}
catch (class CNoRunExit &)