(9f4948c63) Fixed: Welcome text size. Added: Using enter / escape to close both videoplayer and infobox to prevent errors when quitting while these are active

This commit is contained in:
Joonas Rikkonen
2019-03-27 20:52:30 +02:00
parent b66bdb6da4
commit 47b16f4f9e
9 changed files with 247 additions and 7 deletions
@@ -670,6 +670,13 @@ namespace Barotrauma
msg.Timer -= deltaTime;
msg.Pos += msg.Velocity * deltaTime;
}
foreach (GUIMessage msg in messages)
{
if (!msg.WorldSpace) continue;
msg.Timer -= deltaTime;
msg.Pos += msg.Velocity * deltaTime;
}
}
messages.RemoveAll(m => m.Timer <= 0.0f);
@@ -29,7 +29,7 @@ namespace Barotrauma
return isPlaying;
}
private readonly Point defaultResolution = new Point(780, 450);
private readonly Point defaultResolution = new Point(936, 540);
private readonly int borderSize = 20;
private readonly Point buttonSize = new Point(160, 50);
private readonly int titleHeight = 30;
@@ -111,7 +111,7 @@ namespace Barotrauma
{
if (currentVideo == null) return;
if (PlayerInput.KeyHit(Keys.Enter))
if (PlayerInput.KeyHit(Keys.Enter) || PlayerInput.KeyHit(Keys.Escape))
{
DisposeVideo(null, null);
return;