From a1a73ef2b30c5b74d30b81a6436f3d49b216a5fa Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 1 Oct 2019 01:00:37 +0200 Subject: [PATCH] - moved the initial C_InitConsole call into D_DoomMain The only difference here were the size values on Windows but for this initial call they have been useless for a long time. When this code was written the console buffer still had a fixed width that needed to be set before adding any text. --- src/d_main.cpp | 2 ++ src/posix/cocoa/i_main.mm | 2 -- src/posix/sdl/i_main.cpp | 1 - src/win32/i_main.cpp | 4 +--- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index f0f42a9fc..869dce80b 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -2284,6 +2284,8 @@ void D_DoomMain (void) int argcount; FIWadManager *iwad_man; const char *batchout = Args->CheckValue("-errorlog"); + + C_InitConsole(80*8, 25*8, false); // +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"); diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm index 90e03267f..bcf1088a5 100644 --- a/src/posix/cocoa/i_main.mm +++ b/src/posix/cocoa/i_main.mm @@ -172,8 +172,6 @@ void OriginalMainTry(int argc, char** argv) progdir = [[exePath stringByDeletingLastPathComponent] UTF8String]; progdir += "/"; - C_InitConsole(80 * 8, 25 * 8, false); - I_DetectOS(); D_DoomMain(); } diff --git a/src/posix/sdl/i_main.cpp b/src/posix/sdl/i_main.cpp index d5a5c68b1..9de36729e 100644 --- a/src/posix/sdl/i_main.cpp +++ b/src/posix/sdl/i_main.cpp @@ -222,7 +222,6 @@ int main (int argc, char **argv) } I_StartupJoysticks(); - C_InitConsole (80*8, 25*8, false); D_DoomMain (); } catch (std::exception &error) diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp index e8c55f043..da686e53f 100644 --- a/src/win32/i_main.cpp +++ b/src/win32/i_main.cpp @@ -978,9 +978,7 @@ void DoMain (HINSTANCE hInstance) CoInitialize (NULL); atexit (UnCOM); - - C_InitConsole (((WinWidth / 8) + 2) * 8, (WinHeight / 12) * 8, false); - + I_DetectOS (); D_DoomMain (); }