unneeded changes

This commit is contained in:
Madthijs
2021-05-11 17:15:21 +02:00
parent 09485b7cf4
commit 0a9b5ded9b
2 changed files with 24 additions and 4 deletions

View File

@@ -529,6 +529,11 @@ int AppStartup()
PL_Init();
IGpLogDriver *logger = PLDrivers::GetLogDriver();
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "Init phase 1...");
ToolBoxInit();
CheckOurEnvirons();
@@ -546,9 +551,15 @@ int AppStartup()
LoadCursors();
ReadInPrefs();
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "Init phase 2...");
SpinCursor(2); // Tick once to let the display driver flush any resolution changes from prefs
FlushResolutionChange();
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "Init phase 3...");
#if defined COMPILEDEMO
copyGood = true;
#elif defined COMPILENOCP
@@ -573,6 +584,9 @@ int AppStartup()
InitSrcRects();
CreateOffscreens();
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "Init phase 3...");
bool resolutionChanged = false;
if (!isPrefsLoaded)
@@ -585,7 +599,7 @@ int AppStartup()
FlushResolutionChange();
}
ShowInitialLaunchDisclaimer();
ShowInitialLaunchDisclaimer();
}
if (thisMac.isResolutionDirty)
@@ -599,10 +613,14 @@ int AppStartup()
if (isDoColorFade)
PortabilityLayer::WindowManager::GetInstance()->SetWindowDesaturation(mainWindow, 1.0);
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "Init phase 4...");
InitSound(); SpinCursor(2);
InitMusic(); SpinCursor(2);
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "Init phase 5...");
BuildHouseList();
OpenHouse(true);
@@ -618,6 +636,9 @@ int AppStartup()
// HideMenuBarOld();
#endif
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "Initialization completed");
if (isDoColorFade)
WashColorIn();

View File

@@ -453,9 +453,8 @@ bool GpFontHandler_FreeType2::Init()
return true;
}
#ifdef _MSC_VER
extern "C"
#ifdef _MSC_VER
__declspec(dllexport)
#endif
IGpFontHandler *GpDriver_CreateFontHandler_FreeType2(const GpFontHandlerProperties &properties)