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

Use BIT32_SET

Browse Source
This commit is contained in:
twinaphex 2016-05-06 05:16:15 +02:00
parent b91ad3a70e
commit 4ec6cb47ec
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/input_overlay.c
View File

@ -751,13 +751,13 @@ void input_poll_overlay(float opacity)
analog_y = (float)ol_state->analog[analog_base + 1] / 0x7fff;
if (analog_x <= -settings->input.axis_threshold)
ol_state->buttons |= (1UL << RETRO_DEVICE_ID_JOYPAD_LEFT);
BIT32_SET(ol_state->buttons, RETRO_DEVICE_ID_JOYPAD_LEFT);
if (analog_x >= settings->input.axis_threshold)
ol_state->buttons |= (1UL << RETRO_DEVICE_ID_JOYPAD_RIGHT);
BIT32_SET(ol_state->buttons, RETRO_DEVICE_ID_JOYPAD_RIGHT);
if (analog_y <= -settings->input.axis_threshold)
ol_state->buttons |= (1UL << RETRO_DEVICE_ID_JOYPAD_UP);
BIT32_SET(ol_state->buttons, RETRO_DEVICE_ID_JOYPAD_UP);
if (analog_y >= settings->input.axis_threshold)
ol_state->buttons |= (1UL << RETRO_DEVICE_ID_JOYPAD_DOWN);
BIT32_SET(ol_state->buttons, RETRO_DEVICE_ID_JOYPAD_DOWN);
break;
}

21
menu/menu_input.c
View File

@ -1281,15 +1281,6 @@ unsigned menu_input_frame_retropad(retro_input_t input,
float delta_time;
static bool initial_held = true;
static bool first_held = false;
static const retro_input_t input_repeat =
(1UL << RETRO_DEVICE_ID_JOYPAD_UP)
| (1UL << RETRO_DEVICE_ID_JOYPAD_DOWN)
| (1UL << RETRO_DEVICE_ID_JOYPAD_LEFT)
| (1UL << RETRO_DEVICE_ID_JOYPAD_RIGHT)
| (1UL << RETRO_DEVICE_ID_JOYPAD_B)
| (1UL << RETRO_DEVICE_ID_JOYPAD_A)
| (1UL << RETRO_DEVICE_ID_JOYPAD_L)
| (1UL << RETRO_DEVICE_ID_JOYPAD_R);
bool set_scroll = false;
size_t new_scroll_accel = 0;
menu_input_t *menu_input = menu_input_get_ptr();
@ -1303,7 +1294,7 @@ unsigned menu_input_frame_retropad(retro_input_t input,
/* don't run anything first frame, only capture held inputs
* for old_input_state. */
if (input & input_repeat)
if (input)
{
if (!first_held)
{
@ -1314,6 +1305,16 @@ unsigned menu_input_frame_retropad(retro_input_t input,
if (menu_input->delay.count >= menu_input->delay.timer)
{
retro_input_t input_repeat = 0;
BIT32_SET(input_repeat, RETRO_DEVICE_ID_JOYPAD_UP);
BIT32_SET(input_repeat, RETRO_DEVICE_ID_JOYPAD_DOWN);
BIT32_SET(input_repeat, RETRO_DEVICE_ID_JOYPAD_LEFT);
BIT32_SET(input_repeat, RETRO_DEVICE_ID_JOYPAD_RIGHT);
BIT32_SET(input_repeat, RETRO_DEVICE_ID_JOYPAD_B);
BIT32_SET(input_repeat, RETRO_DEVICE_ID_JOYPAD_A);
BIT32_SET(input_repeat, RETRO_DEVICE_ID_JOYPAD_L);
BIT32_SET(input_repeat, RETRO_DEVICE_ID_JOYPAD_R);
set_scroll = true;
first_held = false;
trigger_input |= input & input_repeat;