From c04ce9643293a35e05676ec660678d75573bf34c Mon Sep 17 00:00:00 2001 From: Gama11 Date: Fri, 26 Aug 2016 23:21:44 +0200 Subject: [PATCH] flixel.input.gamepad.mappings: fix dead code in getID() functions The if-statements were not in the return path of the block, as NONE was the last expression in it. Since the ifs are side-effect-free, they were simply DCE'd by Haxe's analyzer. Using guards fixes this and also makes the code nicer. --- .../input/gamepad/mappings/LogitechMapping.hx | 19 ++++++++--------- flixel/input/gamepad/mappings/MFiMapping.hx | 19 ++++++++--------- .../mappings/MayflashWiiRemoteMapping.hx | 21 +++++++++---------- flixel/input/gamepad/mappings/OUYAMapping.hx | 19 ++++++++--------- flixel/input/gamepad/mappings/PS4Mapping.hx | 19 ++++++++--------- .../input/gamepad/mappings/PSVitaMapping.hx | 19 ++++++++--------- .../gamepad/mappings/WiiRemoteMapping.hx | 19 ++++++++--------- .../input/gamepad/mappings/XInputMapping.hx | 19 ++++++++--------- 8 files changed, 73 insertions(+), 81 deletions(-) diff --git a/flixel/input/gamepad/mappings/LogitechMapping.hx b/flixel/input/gamepad/mappings/LogitechMapping.hx index 843ea4caf0..cce55bf7e5 100644 --- a/flixel/input/gamepad/mappings/LogitechMapping.hx +++ b/flixel/input/gamepad/mappings/LogitechMapping.hx @@ -40,16 +40,15 @@ class LogitechMapping extends FlxGamepadMapping case LogitechID.DPAD_RIGHT: DPAD_RIGHT; case LogitechID.DPAD_UP: DPAD_UP; case LogitechID.LOGITECH: GUIDE; - default: - if (rawID == LogitechID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP; - if (rawID == LogitechID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN; - if (rawID == LogitechID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT; - if (rawID == LogitechID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT; - if (rawID == LogitechID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP; - if (rawID == LogitechID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN; - if (rawID == LogitechID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT; - if (rawID == LogitechID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT; - NONE; + case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP; + case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN; + case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT; + case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT; + case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP; + case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN; + case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT; + case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT; + case _: NONE; } } diff --git a/flixel/input/gamepad/mappings/MFiMapping.hx b/flixel/input/gamepad/mappings/MFiMapping.hx index aaae1a6083..6e9b6a9a0f 100644 --- a/flixel/input/gamepad/mappings/MFiMapping.hx +++ b/flixel/input/gamepad/mappings/MFiMapping.hx @@ -30,16 +30,15 @@ class MFiMapping extends FlxGamepadMapping case MFiID.DPAD_DOWN: DPAD_DOWN; case MFiID.DPAD_LEFT: DPAD_LEFT; case MFiID.DPAD_RIGHT: DPAD_RIGHT; - default: - if (rawID == MFiID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP; - if (rawID == MFiID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN; - if (rawID == MFiID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT; - if (rawID == MFiID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT; - if (rawID == MFiID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP; - if (rawID == MFiID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN; - if (rawID == MFiID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT; - if (rawID == MFiID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT; - NONE; + case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP; + case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN; + case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT; + case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT; + case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP; + case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN; + case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT; + case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT; + case _: NONE; } } diff --git a/flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx b/flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx index a229fc85e6..140ed4e0db 100644 --- a/flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx +++ b/flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx @@ -18,7 +18,7 @@ class MayflashWiiRemoteMapping extends FlxGamepadMapping override function initValues():Void { - //But you'll only get non-zero values for it when the Nunchuk is attached + // but you'll only get non-zero values for it when the Nunchuk is attached supportsPointer = true; } @@ -51,16 +51,15 @@ class MayflashWiiRemoteMapping extends FlxGamepadMapping case MayflashWiiRemoteID.CLASSIC_DPAD_DOWN: DPAD_DOWN; case MayflashWiiRemoteID.CLASSIC_DPAD_LEFT: DPAD_LEFT; case MayflashWiiRemoteID.CLASSIC_DPAD_RIGHT: DPAD_RIGHT; - default: - if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP; - if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN; - if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT; - if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT; - if (rawID == MayflashWiiRemoteID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP; - if (rawID == MayflashWiiRemoteID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN; - if (rawID == MayflashWiiRemoteID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT; - if (rawID == MayflashWiiRemoteID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT; - NONE; + case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP; + case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN; + case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT; + case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT; + case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP; + case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN; + case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT; + case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT; + case _: NONE; } } diff --git a/flixel/input/gamepad/mappings/OUYAMapping.hx b/flixel/input/gamepad/mappings/OUYAMapping.hx index bc1626b69a..f6fd4a3955 100644 --- a/flixel/input/gamepad/mappings/OUYAMapping.hx +++ b/flixel/input/gamepad/mappings/OUYAMapping.hx @@ -38,16 +38,15 @@ class OUYAMapping extends FlxGamepadMapping case OUYAID.DPAD_DOWN: DPAD_DOWN; case OUYAID.DPAD_LEFT: DPAD_LEFT; case OUYAID.DPAD_RIGHT: DPAD_RIGHT; - default: - if (rawID == OUYAID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP; - if (rawID == OUYAID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN; - if (rawID == OUYAID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT; - if (rawID == OUYAID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT; - if (rawID == OUYAID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP; - if (rawID == OUYAID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN; - if (rawID == OUYAID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT; - if (rawID == OUYAID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT; - NONE; + case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP; + case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN; + case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT; + case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT; + case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP; + case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN; + case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT; + case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT; + case _: NONE; } } diff --git a/flixel/input/gamepad/mappings/PS4Mapping.hx b/flixel/input/gamepad/mappings/PS4Mapping.hx index 425c96d1b4..ecf625c231 100644 --- a/flixel/input/gamepad/mappings/PS4Mapping.hx +++ b/flixel/input/gamepad/mappings/PS4Mapping.hx @@ -41,16 +41,15 @@ class PS4Mapping extends FlxGamepadMapping case PS4ID.DPAD_UP: DPAD_UP; case PS4ID.DPAD_LEFT: DPAD_LEFT; case PS4ID.DPAD_RIGHT: DPAD_RIGHT; - default: - if (rawID == PS4ID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP; - if (rawID == PS4ID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN; - if (rawID == PS4ID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT; - if (rawID == PS4ID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT; - if (rawID == PS4ID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP; - if (rawID == PS4ID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN; - if (rawID == PS4ID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT; - if (rawID == PS4ID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT; - NONE; + case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP; + case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN; + case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT; + case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT; + case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP; + case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN; + case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT; + case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT; + case _: NONE; } } diff --git a/flixel/input/gamepad/mappings/PSVitaMapping.hx b/flixel/input/gamepad/mappings/PSVitaMapping.hx index 92fec9f53b..a1380ed938 100644 --- a/flixel/input/gamepad/mappings/PSVitaMapping.hx +++ b/flixel/input/gamepad/mappings/PSVitaMapping.hx @@ -27,16 +27,15 @@ class PSVitaMapping extends FlxGamepadMapping case PSVitaID.DPAD_UP: DPAD_UP; case PSVitaID.DPAD_LEFT: DPAD_LEFT; case PSVitaID.DPAD_RIGHT: DPAD_RIGHT; - default: - if (rawID == PSVitaID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP; - if (rawID == PSVitaID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN; - if (rawID == PSVitaID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT; - if (rawID == PSVitaID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT; - if (rawID == PSVitaID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP; - if (rawID == PSVitaID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN; - if (rawID == PSVitaID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT; - if (rawID == PSVitaID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT; - NONE; + case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP; + case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_UP; + case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT; + case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT; + case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP; + case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN; + case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT; + case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT; + case _: NONE; } } diff --git a/flixel/input/gamepad/mappings/WiiRemoteMapping.hx b/flixel/input/gamepad/mappings/WiiRemoteMapping.hx index c0736d484b..ccc73b7269 100644 --- a/flixel/input/gamepad/mappings/WiiRemoteMapping.hx +++ b/flixel/input/gamepad/mappings/WiiRemoteMapping.hx @@ -51,16 +51,15 @@ class WiiRemoteMapping extends FlxGamepadMapping case WiiRemoteID.CLASSIC_DPAD_RIGHT: DPAD_RIGHT; case WiiRemoteID.CLASSIC_ONE: EXTRA_0; case WiiRemoteID.CLASSIC_TWO: EXTRA_1; - default: - if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP; - if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN; - if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT; - if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT; - if (rawID == WiiRemoteID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP; - if (rawID == WiiRemoteID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN; - if (rawID == WiiRemoteID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT; - if (rawID == WiiRemoteID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT; - NONE; + case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP; + case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN; + case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT; + case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT; + case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP; + case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN; + case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT; + case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT; + case _: NONE; } } diff --git a/flixel/input/gamepad/mappings/XInputMapping.hx b/flixel/input/gamepad/mappings/XInputMapping.hx index 1a691dfb9e..0469f5e224 100644 --- a/flixel/input/gamepad/mappings/XInputMapping.hx +++ b/flixel/input/gamepad/mappings/XInputMapping.hx @@ -48,16 +48,15 @@ class XInputMapping extends FlxGamepadMapping case XInputID.DPAD_DOWN: DPAD_DOWN; case XInputID.DPAD_LEFT: DPAD_LEFT; case XInputID.DPAD_RIGHT: DPAD_RIGHT; - default: - if (rawID == XInputID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP; - if (rawID == XInputID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN; - if (rawID == XInputID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT; - if (rawID == XInputID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT; - if (rawID == XInputID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP; - if (rawID == XInputID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN; - if (rawID == XInputID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT; - if (rawID == XInputID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT; - NONE; + case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP; + case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN; + case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT; + case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT; + case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP; + case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN; + case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT; + case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT; + case _: NONE; } }