mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 16:14:38 +00:00
Merge branch 'alpha40/splashscreenSuppression' into alpha40/SGCleanups2
This commit is contained in:
commit
3fabbc651f
1 changed files with 7 additions and 2 deletions
|
|
@ -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...");
|
||||||
Loading…
Add table
Add a link
Reference in a new issue