diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs index 25ce20628..23470c6dc 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs @@ -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; diff --git a/Barotrauma/BarotraumaClient/Source/GameMain.cs b/Barotrauma/BarotraumaClient/Source/GameMain.cs index abc15b4e2..78c9fbfd3 100644 --- a/Barotrauma/BarotraumaClient/Source/GameMain.cs +++ b/Barotrauma/BarotraumaClient/Source/GameMain.cs @@ -406,6 +406,7 @@ namespace Barotrauma GUIComponent.UpdateMouseOn(); DebugConsole.Update(this, (float)Timing.Step); + paused = paused || DebugConsole.IsOpen; if (!paused) { diff --git a/Barotrauma/BarotraumaClient/Source/PlayerInput.cs b/Barotrauma/BarotraumaClient/Source/PlayerInput.cs index 1ba204ecf..bbff9c1f7 100644 --- a/Barotrauma/BarotraumaClient/Source/PlayerInput.cs +++ b/Barotrauma/BarotraumaClient/Source/PlayerInput.cs @@ -143,23 +143,26 @@ namespace Barotrauma { timeSinceClick += deltaTime; - oldMouseState = mouseState; - mouseState = latestMouseState; - UpdateVariable(); - - oldKeyboardState = keyboardState; - keyboardState = Keyboard.GetState(); - - doubleClicked = false; - if (LeftButtonClicked()) + if (GameMain.Instance.IsActive) { - if (timeSinceClick < DoubleClickDelay && - (mouseState.Position - lastClickPosition).ToVector2().Length() < MaxDoubleClickDistance) + oldMouseState = mouseState; + mouseState = latestMouseState; + UpdateVariable(); + + oldKeyboardState = keyboardState; + keyboardState = Keyboard.GetState(); + + doubleClicked = false; + if (LeftButtonClicked()) { - doubleClicked = true; + if (timeSinceClick < DoubleClickDelay && + (mouseState.Position - lastClickPosition).ToVector2().Length() < MaxDoubleClickDistance) + { + doubleClicked = true; + } + lastClickPosition = mouseState.Position; + timeSinceClick = 0.0; } - lastClickPosition = mouseState.Position; - timeSinceClick = 0.0; } } diff --git a/README.md b/README.md index f4a97ce5d..a02377f18 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,6 @@ Before downloading the source code, please read the [EULA](EULA.txt). ### Windows - [Visual Studio](https://www.visualstudio.com/vs/community/) with C# 6.0 support (VS 2015 or later recommended) ### Linux -- [Mono 5.4](www.mono-project.com) +- [Mono 5.4](http://www.mono-project.com) - [MonoDevelop 6](http://www.monodevelop.com/) - *Note: See http://community.monogame.net/t/installing-monogame-3-6-on-linux/8811 to get this version of MonoDevelop if your distro's package distribution suite is outdated.*