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

Input Handling (#90)

Browse Source 
* Migrates the Examine system to the new Input system.

* Update Engine.
This commit is contained in:
Acruid
2018-08-08 11:43:49 -07:00
committed by GitHub
parent b0a3f294c5
commit 830159390b
7 changed files with 62 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
View File

@@ -13,6 +13,7 @@ using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.IoC;
using SS14.Shared.Players;
using SS14.Shared.Serialization;
namespace Content.Server.GameObjects
@@ -42,9 +43,9 @@ namespace Content.Server.GameObjects
// Mostly arbitrary.
public const float PICKUP_RANGE = 2;
private InputCommand SwapHandsCommand;
private InputCommand DropCommand;
private InputCommand ActivateItemInHandCommand;
private InputCmdHandler _swapHandsCmdHandler;
private InputCmdHandler _dropCmdHandler;
private InputCmdHandler _activateItemInHandCmdHandler;
public override void ExposeData(ObjectSerializer serializer)
{
@@ -250,7 +251,7 @@ namespace Content.Server.GameObjects
return new HandsComponentState(dict, ActiveIndex);
}
private void SwapHands()
private void SwapHands(ICommonSession channel)
{
var index = orderedHands.FindIndex(x => x == ActiveIndex);
index++;
@@ -298,9 +299,9 @@ namespace Content.Server.GameObjects
case PlayerAttachedMsg msg:
InitInputCommands();
input = msg.NewPlayer.Input;
input.SetCommand(ContentKeyFunctions.SwapHands, SwapHandsCommand);
input.SetCommand(ContentKeyFunctions.Drop, DropCommand);
input.SetCommand(ContentKeyFunctions.ActivateItemInHand, ActivateItemInHandCommand);
input.SetCommand(ContentKeyFunctions.SwapHands, _swapHandsCmdHandler);
input.SetCommand(ContentKeyFunctions.Drop, _dropCmdHandler);
input.SetCommand(ContentKeyFunctions.ActivateItemInHand, _activateItemInHandCmdHandler);
break;
case PlayerDetachedMsg msg:
@@ -314,14 +315,14 @@ namespace Content.Server.GameObjects
private void InitInputCommands()
{
if (SwapHandsCommand != null)
if (_swapHandsCmdHandler != null)
{
return;
}
SwapHandsCommand = InputCommand.FromDelegate(SwapHands);
DropCommand = InputCommand.FromDelegate(() => Drop(ActiveIndex));
ActivateItemInHandCommand = InputCommand.FromDelegate(() =>
_swapHandsCmdHandler = InputCmdHandler.FromDelegate(SwapHands);
_dropCmdHandler = InputCmdHandler.FromDelegate(session => Drop(ActiveIndex));
_activateItemInHandCmdHandler = InputCmdHandler.FromDelegate(session =>
{
var used = GetActiveHand?.Owner;
if (used != null)