From d527866e6d73c4245f7914d66c710fd1b615f343 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 2 Feb 2020 11:29:17 +0200 Subject: [PATCH] - moved showing of start window banner to proper location in Cocoa backend --- src/posix/cocoa/i_system.mm | 6 ++++++ src/posix/cocoa/st_start.mm | 1 - src/posix/i_system_posix.cpp | 5 ----- src/posix/sdl/i_system.cpp | 4 ++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/posix/cocoa/i_system.mm b/src/posix/cocoa/i_system.mm index 8535abc690..d27ccd6dd7 100644 --- a/src/posix/cocoa/i_system.mm +++ b/src/posix/cocoa/i_system.mm @@ -60,6 +60,12 @@ void CalculateCPUSpeed() } +void I_SetIWADInfo() +{ + FConsoleWindow::GetInstance().SetTitleText(); +} + + void I_DebugPrint(const char *cp) { NSLog(@"%s", cp); diff --git a/src/posix/cocoa/st_start.mm b/src/posix/cocoa/st_start.mm index feaa5412fd..a98ca9873e 100644 --- a/src/posix/cocoa/st_start.mm +++ b/src/posix/cocoa/st_start.mm @@ -66,7 +66,6 @@ FBasicStartupScreen::FBasicStartupScreen(int maxProgress, bool showBar) { FConsoleWindow& consoleWindow = FConsoleWindow::GetInstance(); consoleWindow.SetProgressBar(true); - consoleWindow.SetTitleText(); #if 0 // Testing code, please do not remove diff --git a/src/posix/i_system_posix.cpp b/src/posix/i_system_posix.cpp index a3b3563177..0f4f5599c1 100644 --- a/src/posix/i_system_posix.cpp +++ b/src/posix/i_system_posix.cpp @@ -56,11 +56,6 @@ void I_Init() } -void I_SetIWADInfo() -{ -} - - bool I_WriteIniFailed() { printf("The config file %s could not be saved:\n%s\n", GameConfig->GetPathName(), strerror(errno)); diff --git a/src/posix/sdl/i_system.cpp b/src/posix/sdl/i_system.cpp index 4f6178d57a..b1f1c261c8 100644 --- a/src/posix/sdl/i_system.cpp +++ b/src/posix/sdl/i_system.cpp @@ -41,6 +41,10 @@ int I_PickIWad_Cocoa (WadStuff *wads, int numwads, bool showwin, int defaultiwad double PerfToSec, PerfToMillisec; +void I_SetIWADInfo() +{ +} + // // I_Error //