From 0210f8f72f69206f31f4078d634aac3227134517 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 17 Dec 2012 20:53:36 +0100 Subject: [PATCH] (Android) Last input tweak for today --- android/native/jni/input_android.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c index 9fad8a5919..2c84e85b9e 100644 --- a/android/native/jni/input_android.c +++ b/android/native/jni/input_android.c @@ -350,21 +350,13 @@ static void android_input_poll(void *data) static int16_t android_input_state(void *data, const struct retro_keybind **binds, unsigned port, unsigned device, unsigned index, unsigned id) { - unsigned player = port; - uint64_t button = binds[player][id].joykey; - int16_t retval = 0; - - if((player < pads_connected)) + switch (device) { - switch (device) - { - case RETRO_DEVICE_JOYPAD: - retval = (state[player] & button) ? 1 : 0; - break; - } - } - - return retval; + case RETRO_DEVICE_JOYPAD: + return ((state[port] & binds[port][id].joykey) && (port < pads_connected)); + default: + return 0; + } } static bool android_input_key_pressed(void *data, int key)