tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use MainViewport when input is not provided a viewport (#3897)

Browse Source
This commit is contained in:
ShadowCommander
2021-04-29 15:01:13 -07:00
committed by GitHub
parent 6a5e7dbecb
commit ec00d4fa03
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/State/GameScreen.cs
View File

@@ -165,5 +165,13 @@ namespace Content.Client.State
Viewport.Viewport.Eye = _eyeManager.CurrentEye; Viewport.Viewport.Eye = _eyeManager.CurrentEye;
} }
protected override void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args)
{
if (args.Viewport == null)
base.OnKeyBindStateChanged(new ViewportBoundKeyEventArgs(args.KeyEventArgs, Viewport.Viewport));
else
base.OnKeyBindStateChanged(args);
}
} }
} }

2
Content.Client/State/GameScreenBase.cs
View File

@@ -214,7 +214,7 @@ namespace Content.Client.State
/// Converts a state change event from outside the simulation to inside the simulation. /// Converts a state change event from outside the simulation to inside the simulation.
/// </summary> /// </summary>
/// <param name="args">Event data values for a bound key state change.</param> /// <param name="args">Event data values for a bound key state change.</param>
private void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args) protected virtual void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args)
{ {
// If there is no InputSystem, then there is nothing to forward to, and nothing to do here. // If there is no InputSystem, then there is nothing to forward to, and nothing to do here.
if(!EntitySystemManager.TryGetEntitySystem(out InputSystem? inputSys)) if(!EntitySystemManager.TryGetEntitySystem(out InputSystem? inputSys))