(143d158cb) Merge branch 'dev' into human-ai

2019-05-16 05:25:02 +03:00
parent 9fab69663b
commit e4f41789b0
18 changed files with 594 additions and 814 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();