(e7b2add9d) Merge branch 'human-ai' of https://github.com/Regalis11/Barotrauma-development into human-ai

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:30:39 +03:00
parent 54a0164f89
commit 7614642d93
34 changed files with 369 additions and 316 deletions
@@ -88,7 +88,7 @@ namespace Barotrauma
public override bool Equals(object obj)
{
if (obj is KeyOrMouse keyOrMouse )
if (obj is KeyOrMouse keyOrMouse)
{
if (MouseButton.HasValue)
{
@@ -156,6 +156,26 @@ namespace Barotrauma
{
get { return GameMain.Config.KeyBind(inputType); }
}
#if CLIENT
private KeyOrMouse binding
{
get { return GameMain.Config.KeyBind(inputType); }
}
public KeyOrMouse State
{
get { return binding; }
}
public void SetState()
{
hit = binding.IsHit();
if (hit) hitQueue = true;
held = binding.IsDown();
if (held) heldQueue = true;
}
#endif
public KeyOrMouse State
{