Merge branch 'master' of https://bitbucket.org/Regalis11/subsurface-private

+ character input keys in array instead of separate variables
2015-08-22 16:57:57 +03:00
parent b2d6548fce 1e990784b2
commit f3b390eb9d
102 changed files with 1847 additions and 709 deletions
@@ -28,7 +28,7 @@ namespace Subsurface.Items.Components
        public override bool Use(float deltaTime, Character character = null)
        {
            if (character == null) return false;
-            if (!character.SecondaryKeyDown.State || throwing) return false;
+            if (!character.GetInputState(InputType.SecondaryHeld) || throwing) return false;

            throwing = true;

@@ -60,7 +60,7 @@ namespace Subsurface.Items.Components
            if (!item.body.Enabled) return;
            if (!picker.HasSelectedItem(item)) isActive = false;

-            if (!picker.SecondaryKeyDown.State && !throwing) throwPos = 0.0f;
+            if (!picker.GetInputState(InputType.SecondaryHeld) && !throwing) throwPos = 0.0f;

            ApplyStatusEffects(ActionType.OnActive, deltaTime, picker);