Merge branch 'master' of https://github.com/Regalis11/Barotrauma

2018-01-31 19:02:03 +02:00
parent dcb6de32c0 cbe80a3097
commit 69337cd9e3
4 changed files with 20 additions and 16 deletions
@@ -123,7 +123,7 @@ namespace Barotrauma
            Vector2 mouseSimPos = ConvertUnits.ToSimUnits(cursorPosition);
            if (moveCam)
            {
-                if (DebugConsole.IsOpen || GUI.PauseMenuOpen || DisableControls ||
+                if (DebugConsole.IsOpen || GUI.PauseMenuOpen || IsUnconscious ||
                    (GameMain.GameSession?.CrewManager?.CrewCommander != null && GameMain.GameSession.CrewManager.CrewCommander.IsOpen))
                {
                    if (deltaTime > 0.0f) cam.OffsetAmount = 0.0f;