From dc9a67465d480934127e48cdc41e5ccfe4961578 Mon Sep 17 00:00:00 2001 From: Lars Doucet Date: Sat, 27 Feb 2016 12:21:47 -0600 Subject: [PATCH] fix ifs --- .../input/gamepad/mappings/LogitechMapping.hx | 16 ++++++------- .../mappings/MayflashWiiRemoteMapping.hx | 24 +++++++++---------- flixel/input/gamepad/mappings/OUYAMapping.hx | 16 ++++++------- flixel/input/gamepad/mappings/PS4Mapping.hx | 16 ++++++------- .../input/gamepad/mappings/PSVitaMapping.hx | 16 ++++++------- .../gamepad/mappings/WiiRemoteMapping.hx | 24 +++++++++---------- .../input/gamepad/mappings/XInputMapping.hx | 16 ++++++------- 7 files changed, 64 insertions(+), 64 deletions(-) diff --git a/flixel/input/gamepad/mappings/LogitechMapping.hx b/flixel/input/gamepad/mappings/LogitechMapping.hx index 3833bfe7a8..e079fd954c 100644 --- a/flixel/input/gamepad/mappings/LogitechMapping.hx +++ b/flixel/input/gamepad/mappings/LogitechMapping.hx @@ -42,14 +42,14 @@ class LogitechMapping extends FlxGamepadMapping 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; + 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; } } diff --git a/flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx b/flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx index 632e032d4d..785a1bb07b 100644 --- a/flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx +++ b/flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx @@ -53,14 +53,14 @@ class MayflashWiiRemoteMapping extends FlxGamepadMapping 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; + 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; } } @@ -83,10 +83,10 @@ class MayflashWiiRemoteMapping extends FlxGamepadMapping case MayflashWiiRemoteID.NUNCHUK_DPAD_LEFT: DPAD_LEFT; case MayflashWiiRemoteID.NUNCHUK_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.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; NONE; } } diff --git a/flixel/input/gamepad/mappings/OUYAMapping.hx b/flixel/input/gamepad/mappings/OUYAMapping.hx index 865de1932e..a23ac4d2a6 100644 --- a/flixel/input/gamepad/mappings/OUYAMapping.hx +++ b/flixel/input/gamepad/mappings/OUYAMapping.hx @@ -40,14 +40,14 @@ class OUYAMapping extends FlxGamepadMapping 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; + 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; } } diff --git a/flixel/input/gamepad/mappings/PS4Mapping.hx b/flixel/input/gamepad/mappings/PS4Mapping.hx index 816b0a9194..96bf290d0f 100644 --- a/flixel/input/gamepad/mappings/PS4Mapping.hx +++ b/flixel/input/gamepad/mappings/PS4Mapping.hx @@ -43,14 +43,14 @@ class PS4Mapping extends FlxGamepadMapping 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; + 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; } } diff --git a/flixel/input/gamepad/mappings/PSVitaMapping.hx b/flixel/input/gamepad/mappings/PSVitaMapping.hx index 5e1b93a5bc..d53ca8df13 100644 --- a/flixel/input/gamepad/mappings/PSVitaMapping.hx +++ b/flixel/input/gamepad/mappings/PSVitaMapping.hx @@ -29,14 +29,14 @@ class PSVitaMapping extends FlxGamepadMapping 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; + 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; } } diff --git a/flixel/input/gamepad/mappings/WiiRemoteMapping.hx b/flixel/input/gamepad/mappings/WiiRemoteMapping.hx index eff24495ab..36f9622172 100644 --- a/flixel/input/gamepad/mappings/WiiRemoteMapping.hx +++ b/flixel/input/gamepad/mappings/WiiRemoteMapping.hx @@ -53,14 +53,14 @@ class WiiRemoteMapping extends FlxGamepadMapping 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; + 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; } } @@ -83,10 +83,10 @@ class WiiRemoteMapping extends FlxGamepadMapping case WiiRemoteID.NUNCHUK_DPAD_LEFT: DPAD_LEFT; case WiiRemoteID.NUNCHUK_DPAD_RIGHT: DPAD_RIGHT; 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.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; NONE; } } diff --git a/flixel/input/gamepad/mappings/XInputMapping.hx b/flixel/input/gamepad/mappings/XInputMapping.hx index eae43f7b69..09c1ee775b 100644 --- a/flixel/input/gamepad/mappings/XInputMapping.hx +++ b/flixel/input/gamepad/mappings/XInputMapping.hx @@ -50,14 +50,14 @@ class XInputMapping extends FlxGamepadMapping 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; + 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; } }