vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed launcher throwing a null reference exception because of a reference to GameMain in PlayerInput

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-02-21 23:43:40 +02:00
parent 637d473773
commit b4582b6188
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Barotrauma/BarotraumaClient/Source/GameMain.cs
View File

@@ -360,8 +360,11 @@ namespace Barotrauma
fixedTime.ElapsedGameTime = addTime;
fixedTime.TotalGameTime.Add(addTime);
base.Update(fixedTime);
PlayerInput.Update(Timing.Step);
if (WindowActive)
{
PlayerInput.Update(Timing.Step);
}
if (loadingScreenOpen)
{

33
Barotrauma/BarotraumaClient/Source/PlayerInput.cs
View File

@@ -143,27 +143,24 @@ namespace Barotrauma
{
timeSinceClick += deltaTime;
if (GameMain.Instance.IsActive)
oldMouseState = mouseState;
mouseState = latestMouseState;
UpdateVariable();
oldKeyboardState = keyboardState;
keyboardState = Keyboard.GetState();
doubleClicked = false;
if (LeftButtonClicked())
{
oldMouseState = mouseState;
mouseState = latestMouseState;
UpdateVariable();
oldKeyboardState = keyboardState;
keyboardState = Keyboard.GetState();
doubleClicked = false;
if (LeftButtonClicked())
if (timeSinceClick < DoubleClickDelay &&
(mouseState.Position - lastClickPosition).ToVector2().Length() < MaxDoubleClickDistance)
{
if (timeSinceClick < DoubleClickDelay &&
(mouseState.Position - lastClickPosition).ToVector2().Length() < MaxDoubleClickDistance)
{
doubleClicked = true;
}
lastClickPosition = mouseState.Position;
timeSinceClick = 0.0;
doubleClicked = true;
}
}
lastClickPosition = mouseState.Position;
timeSinceClick = 0.0;
}
}
public static void UpdateVariable()