Disabled the splash screen in the Linux version (apparently video playback hasn't been implemented in DesktopGL)

This commit is contained in:
Regalis
2017-02-20 22:03:58 +02:00
parent 0306c03d00
commit c29be7862b
+10 -2
View File
@@ -23,10 +23,10 @@ namespace Barotrauma
public Vector2 TitlePosition; public Vector2 TitlePosition;
private float? loadState; private float? loadState;
#if !LINUX
Video splashScreenVideo; Video splashScreenVideo;
VideoPlayer videoPlayer; VideoPlayer videoPlayer;
#endif
public Vector2 TitleSize public Vector2 TitleSize
{ {
get { return new Vector2(titleTexture.Width, titleTexture.Height); } get { return new Vector2(titleTexture.Width, titleTexture.Height); }
@@ -56,6 +56,8 @@ namespace Barotrauma
public LoadingScreen(GraphicsDevice graphics) public LoadingScreen(GraphicsDevice graphics)
{ {
#if !LINUX
if (GameMain.Config.EnableSplashScreen) if (GameMain.Config.EnableSplashScreen)
{ {
try try
@@ -69,6 +71,8 @@ namespace Barotrauma
GameMain.Config.EnableSplashScreen = false; GameMain.Config.EnableSplashScreen = false;
} }
} }
#endif
backgroundTexture = TextureLoader.FromFile("Content/UI/titleBackground.png"); backgroundTexture = TextureLoader.FromFile("Content/UI/titleBackground.png");
monsterTexture = TextureLoader.FromFile("Content/UI/titleMonster.png"); monsterTexture = TextureLoader.FromFile("Content/UI/titleMonster.png");
@@ -82,6 +86,7 @@ namespace Barotrauma
public void Draw(SpriteBatch spriteBatch, GraphicsDevice graphics, float deltaTime) public void Draw(SpriteBatch spriteBatch, GraphicsDevice graphics, float deltaTime)
{ {
#if !LINUX
if (GameMain.Config.EnableSplashScreen && splashScreenVideo != null) if (GameMain.Config.EnableSplashScreen && splashScreenVideo != null)
{ {
try try
@@ -96,6 +101,7 @@ namespace Barotrauma
GameMain.Config.EnableSplashScreen = false; GameMain.Config.EnableSplashScreen = false;
} }
} }
#endif
drawn = true; drawn = true;
@@ -171,6 +177,7 @@ namespace Barotrauma
} }
#if !LINUX
private void DrawSplashScreen(SpriteBatch spriteBatch) private void DrawSplashScreen(SpriteBatch spriteBatch)
{ {
if (videoPlayer == null) if (videoPlayer == null)
@@ -206,6 +213,7 @@ namespace Barotrauma
} }
} }
#endif
bool drawn; bool drawn;
public IEnumerable<object> DoLoading(IEnumerable<object> loader) public IEnumerable<object> DoLoading(IEnumerable<object> loader)