mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation error introduced by analog overlay changes

Browse Source
This commit is contained in:
Cray Elliott 2013-09-06 01:43:55 -07:00
parent a49d9d98f0
commit ba095dca79
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/native/jni/input_android.c
View File

@ -1855,7 +1855,7 @@ static int16_t android_input_state(void *data, const struct retro_keybind **bind
static bool android_input_key_pressed(void *data, int key) static bool android_input_key_pressed(void *data, int key)
{ {
return ((g_extern.lifecycle_state | driver.overlay_state) & (1ULL << key)); return ((g_extern.lifecycle_state | driver.overlay_state.buttons) & (1ULL << key));
} }
static void android_input_free_input(void *data) static void android_input_free_input(void *data)

2
frontend/menu/menu_common.c
View File

@ -704,7 +704,7 @@ static uint64_t rgui_input(void)
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
for (unsigned i = 0; i < DEVICE_NAV_LAST; i++) for (unsigned i = 0; i < DEVICE_NAV_LAST; i++)
input_state |= driver.overlay_state & menu_nav_binds[0][i].joykey ? (1ULL << i) : 0; input_state |= driver.overlay_state.buttons & menu_nav_binds[0][i].joykey ? (1ULL << i) : 0;
#endif #endif
#else #else
static const int maps[] = { static const int maps[] = {