(Android) Should fix touchscreen controls no longer responding

after inserting a pad that changes dpad_emulation
This commit is contained in:
twinaphex 2013-02-05 04:24:05 +01:00
parent 924cfb2121
commit d80e0df9e9

View File

@ -143,7 +143,7 @@ static void android_input_poll(void *data)
}
}
if(type_event == AINPUT_EVENT_TYPE_MOTION && (g_settings.input.dpad_emulation[state_id] != DPAD_EMULATION_NONE))
if (type_event == AINPUT_EVENT_TYPE_MOTION)
{
float x = 0.0f;
float y = 0.0f;
@ -151,7 +151,7 @@ static void android_input_poll(void *data)
size_t motion_pointer = action >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
action &= AMOTION_EVENT_ACTION_MASK;
if(source & ~(AINPUT_SOURCE_TOUCHSCREEN | AINPUT_SOURCE_MOUSE))
if(source & ~(AINPUT_SOURCE_TOUCHSCREEN | AINPUT_SOURCE_MOUSE) && (g_settings.input.dpad_emulation[state_id] != DPAD_EMULATION_NONE))
{
uint64_t *state_cur = &state[state_id];
x = AMotionEvent_getX(event, motion_pointer);