From 32b3aa6b00fd8178bcc3220b43ce21a61ddadd06 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 12 Jul 2015 08:45:12 +0200 Subject: [PATCH] (Cocoa) cocoa_input.c - Simplifications --- input/drivers/cocoa_input.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index 16e9675db7..c433deed2c 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -361,14 +361,12 @@ static int16_t cocoa_input_state(void *data, return 0; } -static bool cocoa_input_bind_button_pressed(void *data, int key) +static bool cocoa_input_key_pressed(void *data, int key) { cocoa_input_data_t *apple = (cocoa_input_data_t*)data; settings_t *settings = config_get_ptr(); - if (apple && apple->joypad) - return cocoa_input_is_pressed(apple, 0, settings->input.binds[0], key) || - input_joypad_pressed(apple->joypad, 0, settings->input.binds[0], key); - return false; + return cocoa_input_is_pressed(apple, 0, settings->input.binds[0], key) || + input_joypad_pressed(apple->joypad, 0, settings->input.binds[0], key); } static void cocoa_input_free(void *data) @@ -443,7 +441,7 @@ input_driver_t input_cocoa = { cocoa_input_init, cocoa_input_poll, cocoa_input_state, - cocoa_input_bind_button_pressed, + cocoa_input_key_pressed, cocoa_input_free, NULL, NULL,