diff --git a/Subsurface/Properties/AssemblyInfo.cs b/Subsurface/Properties/AssemblyInfo.cs index 07a987e5f..e7574d2bd 100644 --- a/Subsurface/Properties/AssemblyInfo.cs +++ b/Subsurface/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.5.4.2")] -[assembly: AssemblyFileVersion("0.5.4.2")] +[assembly: AssemblyVersion("0.5.4.3")] +[assembly: AssemblyFileVersion("0.5.4.3")] 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