(9c0250ef1) Merge branch 'dev' into human-ai

2019-05-16 05:14:40 +03:00
parent 2ae54a01a5
commit 7f72f72ca7
27 changed files with 348 additions and 343 deletions
@@ -162,21 +162,6 @@ 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();