mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(input_overlay.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-07-12 07:42:14 +02:00
parent b3e054a946
commit ae14d8c78a
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
input/input_overlay.c
View File

@ -1436,6 +1436,16 @@ enum overlay_status input_overlay_status(void)
return ol->state; return ol->state;
} }
bool input_overlay_key_pressed(int key)
{
input_overlay_state_t *ol_state = input_overlay_get_state_ptr();
if (!ol_state)
return false;
return (ol_state->buttons & (UINT64_C(1) << key));
}
/* /*
* input_poll_overlay: * input_poll_overlay:
* *
@ -1527,9 +1537,9 @@ void input_poll_overlay(float opacity)
if (ol_state->analog[j]) if (ol_state->analog[j])
continue; continue;
if (ol_state->buttons & (1UL << bind_plus)) if (input_overlay_key_pressed(bind_plus))
ol_state->analog[j] += 0x7fff; ol_state->analog[j] += 0x7fff;
if (ol_state->buttons & (1UL << bind_minus)) if (input_overlay_key_pressed(bind_minus))
ol_state->analog[j] -= 0x7fff; ol_state->analog[j] -= 0x7fff;
} }
@ -1584,7 +1594,7 @@ void input_state_overlay(int16_t *ret, unsigned port, unsigned device, unsigned
switch (device) switch (device)
{ {
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
if (ol_state && ol_state->buttons & (UINT64_C(1) << id)) if (input_overlay_key_pressed(id))
*ret |= 1; *ret |= 1;
break; break;
case RETRO_DEVICE_KEYBOARD: case RETRO_DEVICE_KEYBOARD:
@ -1609,12 +1619,3 @@ void input_state_overlay(int16_t *ret, unsigned port, unsigned device, unsigned
} }
} }
bool input_overlay_key_pressed(int key)
{
input_overlay_state_t *ol_state = input_overlay_get_state_ptr();
if (!ol_state)
return false;
return (ol_state->buttons & (1ULL << key));
}