(39b4d0859) Merge branch 'dev' into human-ai

2019-05-16 05:08:56 +03:00
parent 616efac2bf
commit 3a3d55d780
13 changed files with 139 additions and 62 deletions
@@ -162,6 +162,21 @@ namespace Barotrauma
            get { return binding; }
        }

+        public void SetState()
+        {
+            hit = binding.IsHit();
+            if (hit) hitQueue = true;
+
+            held = binding.IsDown();
+            if (held) heldQueue = true;
+        }
+#endif
+
+        public KeyOrMouse State
+        {
+            get { return binding; }
+        }
+
        public void SetState()
        {
            hit = binding.IsHit();