Fixed launcher throwing a null reference exception because of a reference to GameMain in PlayerInput
This commit is contained in:
@@ -360,8 +360,11 @@ namespace Barotrauma
|
|||||||
fixedTime.ElapsedGameTime = addTime;
|
fixedTime.ElapsedGameTime = addTime;
|
||||||
fixedTime.TotalGameTime.Add(addTime);
|
fixedTime.TotalGameTime.Add(addTime);
|
||||||
base.Update(fixedTime);
|
base.Update(fixedTime);
|
||||||
|
|
||||||
PlayerInput.Update(Timing.Step);
|
if (WindowActive)
|
||||||
|
{
|
||||||
|
PlayerInput.Update(Timing.Step);
|
||||||
|
}
|
||||||
|
|
||||||
if (loadingScreenOpen)
|
if (loadingScreenOpen)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -143,27 +143,24 @@ namespace Barotrauma
|
|||||||
{
|
{
|
||||||
timeSinceClick += deltaTime;
|
timeSinceClick += deltaTime;
|
||||||
|
|
||||||
if (GameMain.Instance.IsActive)
|
oldMouseState = mouseState;
|
||||||
|
mouseState = latestMouseState;
|
||||||
|
UpdateVariable();
|
||||||
|
|
||||||
|
oldKeyboardState = keyboardState;
|
||||||
|
keyboardState = Keyboard.GetState();
|
||||||
|
|
||||||
|
doubleClicked = false;
|
||||||
|
if (LeftButtonClicked())
|
||||||
{
|
{
|
||||||
oldMouseState = mouseState;
|
if (timeSinceClick < DoubleClickDelay &&
|
||||||
mouseState = latestMouseState;
|
(mouseState.Position - lastClickPosition).ToVector2().Length() < MaxDoubleClickDistance)
|
||||||
UpdateVariable();
|
|
||||||
|
|
||||||
oldKeyboardState = keyboardState;
|
|
||||||
keyboardState = Keyboard.GetState();
|
|
||||||
|
|
||||||
doubleClicked = false;
|
|
||||||
if (LeftButtonClicked())
|
|
||||||
{
|
{
|
||||||
if (timeSinceClick < DoubleClickDelay &&
|
doubleClicked = true;
|
||||||
(mouseState.Position - lastClickPosition).ToVector2().Length() < MaxDoubleClickDistance)
|
|
||||||
{
|
|
||||||
doubleClicked = true;
|
|
||||||
}
|
|
||||||
lastClickPosition = mouseState.Position;
|
|
||||||
timeSinceClick = 0.0;
|
|
||||||
}
|
}
|
||||||
}
|
lastClickPosition = mouseState.Position;
|
||||||
|
timeSinceClick = 0.0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void UpdateVariable()
|
public static void UpdateVariable()
|
||||||
|
|||||||
Reference in New Issue
Block a user