CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 19:24:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change signature of check_block_hotkey

Browse Source
This commit is contained in:
twinaphex 2015-02-15 01:03:19 +01:00
parent 31a54223e5
commit 94856393a9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runloop.c
View File

@ -729,7 +729,7 @@ static void limit_frame_time(void)
* *
* Checks if 'hotkey enable' key is pressed. * Checks if 'hotkey enable' key is pressed.
**/ **/
static void check_block_hotkey(bool enable_hotkey) static bool check_block_hotkey(bool enable_hotkey)
{ {
bool use_hotkey_enable; bool use_hotkey_enable;
static const struct retro_keybind *bind = static const struct retro_keybind *bind =
@ -754,7 +754,7 @@ static void check_block_hotkey(bool enable_hotkey)
/* If we hold ENABLE_HOTKEY button, block all libretro input to allow /* If we hold ENABLE_HOTKEY button, block all libretro input to allow
* hotkeys to be bound to same keys as RetroPad. */ * hotkeys to be bound to same keys as RetroPad. */
driver.block_libretro_input = use_hotkey_enable && enable_hotkey; return (use_hotkey_enable && enable_hotkey);
} }
/** /**
@ -797,7 +797,8 @@ static inline retro_input_t input_keys_pressed(void)
g_extern.turbo_count++; g_extern.turbo_count++;
check_block_hotkey(driver.input->key_pressed(driver.input_data, driver.block_libretro_input = check_block_hotkey(
driver.input->key_pressed(driver.input_data,
RARCH_ENABLE_HOTKEY)); RARCH_ENABLE_HOTKEY));
for (i = 0; i < g_settings.input.max_users; i++) for (i = 0; i < g_settings.input.max_users; i++)