(86a1bac17) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-04 11:12:46 +03:00
parent 3b35ba056d
commit 6ac3ecd2b2
7 changed files with 1 additions and 248 deletions
@@ -171,15 +171,6 @@ namespace Barotrauma.Items.Components
        }
        
        public override bool SecondaryUse(float deltaTime, Character character = null)
-        {
-            if (item.RequireAimToUse)
-            {
-                return Control(deltaTime, character);
-            }
-            return false;
-        }
-
-        private bool Control(float deltaTime, Character character = null)
        {
            if (this.character != character)
            {
@@ -24,12 +24,6 @@ namespace Barotrauma.Items.Components
        
        private bool itemLoaded;

-        private float blinkTimer;
-        
-        private bool itemLoaded;
-
-        private float blinkTimer;
-        
        public PhysicsBody ParentBody;

        [Editable(MinValueFloat = 0.0f, MaxValueFloat = 2048.0f), Serialize(100.0f, true)]