rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ItemSlotButton and HandsGui handling all input.

Browse source 
Fixes #904
This commit is contained in:
Pieter-Jan Briers 2020-05-11 11:19:41 +02:00
parent 033a6a82b5
commit 63b0df5ba2
No known key found for this signature in database
GPG key ID: 132054DF433AE592
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Content.Client/UserInterface/HandsGui.cs
View file

@ -119,14 +119,13 @@ namespace Content.Client.UserInterface
private void HandKeyBindDown(GUIBoundKeyEventArgs args, string handIndex)
{
args.Handle();
if (!TryGetHands(out var hands))
return;
if (args.Function == ContentKeyFunctions.MouseMiddle)
{
hands.SendChangeHand(handIndex);
args.Handle();
return;
}
@ -136,12 +135,16 @@ namespace Content.Client.UserInterface
if (args.Function == EngineKeyFunctions.UIClick && hands.ActiveIndex != handIndex)
{
hands.SendChangeHand(handIndex);
args.Handle();
}
return;
}
if (_itemSlotManager.OnButtonPressed(args, entity))
{
args.Handle();
return;
}
if (args.Function == EngineKeyFunctions.UIClick)
{
@ -153,6 +156,7 @@ namespace Content.Client.UserInterface
{
hands.AttackByInHand(handIndex);
}
args.Handle();
return;
}
}

3
Content.Client/UserInterface/ItemSlotManager.cs
View file

@ -65,8 +65,6 @@ namespace Content.Client.UserInterface
public bool OnButtonPressed(GUIBoundKeyEventArgs args, IEntity item)
{
args.Handle();
if (item == null)
return false;
@ -99,6 +97,7 @@ namespace Content.Client.UserInterface
{
return false;
}
args.Handle();
return true;
}