From d4d6a2ad30ef5f4e8d7f138a23767a26ffeebf48 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Fri, 29 Mar 2019 17:26:26 +0200 Subject: [PATCH] (f16622a9d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev --- Barotrauma/BarotraumaClient/Source/GameMain.cs | 3 ++- .../GameSession/GameModes/Tutorials/ContextualTutorial.cs | 3 ++- Barotrauma/BarotraumaShared/Source/Map/Hull.cs | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/GameMain.cs b/Barotrauma/BarotraumaClient/Source/GameMain.cs index d08306bd4..09c332ced 100644 --- a/Barotrauma/BarotraumaClient/Source/GameMain.cs +++ b/Barotrauma/BarotraumaClient/Source/GameMain.cs @@ -601,7 +601,8 @@ namespace Barotrauma { ((GUIMessageBox)GUIMessageBox.VisibleBox).Close(); } - else if ((GUI.MouseOn == null || GUI.IsMouseOn(GUI.PauseMenu)) && Inventory.SelectedSlot == null && CharacterHealth.OpenHealthWindow == null) + else if ((Character.Controlled?.SelectedConstruction == null || !Character.Controlled.SelectedConstruction.ActiveHUDs.Any(ic => ic.GuiFrame != null)) + && Inventory.SelectedSlot == null && CharacterHealth.OpenHealthWindow == null) { // Otherwise toggle pausing, unless another window/interface is open. GUI.TogglePauseMenu(); diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs index 58c578bf1..fe46adeae 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs @@ -657,9 +657,10 @@ namespace Barotrauma.Tutorials { foreach (Gap gap in Gap.GapList) { - if (gap.ConnectedWall == null) continue; + if (gap.ConnectedWall == null || gap.IsRoomToRoom) continue; if (gap.ConnectedDoor != null || gap.Open <= 0.0f) continue; if (gap.Submarine == null) continue; + if (gap.Submarine.IsOutpost) continue; if (gap.Submarine != Submarine.MainSub) continue; return true; } diff --git a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs index 485a7b2bc..883c85f65 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs @@ -88,6 +88,7 @@ namespace Barotrauma Gap.UpdateHulls(); } + OxygenPercentage = prevOxygenPercentage; surface = drawSurface = rect.Y - rect.Height + WaterVolume / rect.Width; Pressure = surface; }