libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2014-12-28 05:57:17 +01:00
parent 70abd3ea9b
commit 1ec8099789
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretro_version_1.c
View File

@ -301,12 +301,12 @@ static int16_t input_state(unsigned port, unsigned device,
g_settings.input.binds[15], g_settings.input.binds[15],
}; };
if (!driver.block_libretro_input && if (!driver.block_libretro_input)
((id < RARCH_FIRST_META_KEY || {
device == RETRO_DEVICE_KEYBOARD)) if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD)))
) res = driver.input->input_state(driver.input_data, binds, port,
res = driver.input->input_state(driver.input_data, binds, port, device, idx, id);
device, idx, id); }
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (device == RETRO_DEVICE_JOYPAD && port == 0) if (device == RETRO_DEVICE_JOYPAD && port == 0)

7
runloop.c
View File

@ -599,8 +599,11 @@ static inline retro_input_t input_keys_pressed(void)
input_push_analog_dpad(g_settings.input.autoconf_binds[i], input_push_analog_dpad(g_settings.input.autoconf_binds[i],
g_settings.input.analog_dpad_mode[i]); g_settings.input.analog_dpad_mode[i]);
g_extern.turbo_frame_enable[i] = driver.block_libretro_input ? 0 : if (driver.block_libretro_input)
driver.input->input_state(driver.input_data, binds, i, g_extern.turbo_frame_enable[i] = 0;
else
g_extern.turbo_frame_enable[i] =
driver.input->input_state(driver.input_data, binds, i,
RETRO_DEVICE_JOYPAD, 0, RARCH_TURBO_ENABLE); RETRO_DEVICE_JOYPAD, 0, RARCH_TURBO_ENABLE);
} }