From 7a2bd21b3d7d626604bef1ef4284bc5780f0b071 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 27 Jun 2015 15:52:24 +0200 Subject: [PATCH] (runloop.c) Cleanup --- libretro_version_1.c | 1 - runloop.c | 23 ++++------------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/libretro_version_1.c b/libretro_version_1.c index c5c60394d5..b3d9cfbe38 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -177,7 +177,6 @@ static int16_t input_state(unsigned port, unsigned device, input_remapping_state(port, &device, &idx, &id); if (!driver->block_libretro_input) - { if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD))) res = input_driver_state(libretro_input_binds, port, device, idx, id); diff --git a/runloop.c b/runloop.c index 1a297c000b..d9bd019ddc 100644 --- a/runloop.c +++ b/runloop.c @@ -657,7 +657,6 @@ static void rarch_update_frame_time(void) system->frame_time.callback(delta); } - /** * rarch_limit_frame_time: * @@ -748,28 +747,14 @@ static bool check_block_hotkey(bool enable_hotkey) static INLINE retro_input_t input_keys_pressed(void) { unsigned i; + const struct retro_keybind *binds[MAX_USERS]; retro_input_t ret = 0; driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); - const struct retro_keybind *binds[MAX_USERS] = { - settings->input.binds[0], - settings->input.binds[1], - settings->input.binds[2], - settings->input.binds[3], - settings->input.binds[4], - settings->input.binds[5], - settings->input.binds[6], - settings->input.binds[7], - settings->input.binds[8], - settings->input.binds[9], - settings->input.binds[10], - settings->input.binds[11], - settings->input.binds[12], - settings->input.binds[13], - settings->input.binds[14], - settings->input.binds[15], - }; + + for (i = 0; i < MAX_USERS; i++) + binds[i] = settings->input.binds[i]; if (!driver->input || !driver->input_data) return 0;