(Menu) Create struct for delay timer

This commit is contained in:
twinaphex 2015-02-11 21:48:20 +01:00
parent fe1ac4b8b9
commit 6ded569b87
2 changed files with 9 additions and 6 deletions

View File

@ -73,8 +73,11 @@ typedef struct
void *userdata;
/* Used for key repeat */
unsigned delay_timer;
unsigned delay_count;
struct
{
unsigned timer;
unsigned count;
} delay;
unsigned width;
unsigned height;

View File

@ -470,11 +470,11 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
if (!first_held)
{
first_held = true;
driver.menu->delay_timer = initial_held ? 12 : 6;
driver.menu->delay_count = 0;
driver.menu->delay.timer = initial_held ? 12 : 6;
driver.menu->delay.count = 0;
}
if (driver.menu->delay_count >= driver.menu->delay_timer)
if (driver.menu->delay.count >= driver.menu->delay.timer)
{
first_held = false;
trigger_input |= input & input_repeat;
@ -493,7 +493,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
driver.menu->mouse.enable = g_settings.menu.mouse_enable;
driver.menu->delay_count++;
driver.menu->delay.count++;
if (driver.block_input)
trigger_input = 0;