From c29be7862bb370e720ff33da59e3916ec770562d Mon Sep 17 00:00:00 2001 From: Regalis Date: Mon, 20 Feb 2017 22:03:58 +0200 Subject: [PATCH] Disabled the splash screen in the Linux version (apparently video playback hasn't been implemented in DesktopGL) --- Subsurface/Source/GUI/LoadingScreen.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Subsurface/Source/GUI/LoadingScreen.cs b/Subsurface/Source/GUI/LoadingScreen.cs index f635b71f2..bbf194600 100644 --- a/Subsurface/Source/GUI/LoadingScreen.cs +++ b/Subsurface/Source/GUI/LoadingScreen.cs @@ -21,12 +21,12 @@ namespace Barotrauma public Vector2 CenterPosition; public Vector2 TitlePosition; - - private float? loadState; + private float? loadState; +#if !LINUX Video splashScreenVideo; VideoPlayer videoPlayer; - +#endif public Vector2 TitleSize { get { return new Vector2(titleTexture.Width, titleTexture.Height); } @@ -56,19 +56,23 @@ namespace Barotrauma public LoadingScreen(GraphicsDevice graphics) { +#if !LINUX + if (GameMain.Config.EnableSplashScreen) { try { splashScreenVideo = GameMain.Instance.Content.Load