Merge branch 'alpha40/splashscreenSuppression' into alpha40/SGCleanups2

This commit is contained in:
AzaezelX 2021-09-22 18:50:46 -05:00
commit 3fabbc651f

View file

@ -19,9 +19,14 @@ ModuleDatabase.LoadExplicit( "CoreModule" );
// Display a splash window immediately to improve app responsiveness before // Display a splash window immediately to improve app responsiveness before
// engine is initialized and main window created. // engine is initialized and main window created.
if ($Server::Dedicated == false) if ($Server::Dedicated == false)
displaySplashWindow($Core::splashWindowImage); {
if ($platform $= "windows")
displaySplashWindow($Core::splashWindowImage);
}
else else
{
$Video::forceDisplayAdapter = -1; $Video::forceDisplayAdapter = -1;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Load any gameplay modules // Load any gameplay modules
@ -45,7 +50,7 @@ else
} }
} }
if ($Server::Dedicated == false) if ( ($Server::Dedicated == false) && ($platform $= "windows") )
closeSplashWindow(); closeSplashWindow();
echo("Engine initialized..."); echo("Engine initialized...");