From 077c3a6469518cf2aabbef32bd586312f6ba67b2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 22 Aug 2012 13:50:07 +0200 Subject: [PATCH] (360) Small change to input D-pad emulation logic --- 360/frontend-xdk/menu.cpp | 12 ++++-------- xdk/xdk_xinput_input.c | 3 +++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp index 12fbc5dd15..eab20a70d3 100644 --- a/360/frontend-xdk/menu.cpp +++ b/360/frontend-xdk/menu.cpp @@ -268,12 +268,10 @@ HRESULT CRetroArchControls::OnControlNavigate( case DPAD_EMULATION_NONE: break; case DPAD_EMULATION_LSTICK: - g_settings.input.dpad_emulation[controlno] = DPAD_EMULATION_NONE; - input_xinput.set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[controlno], controlno); + input_xinput.set_analog_dpad_mapping(0, DPAD_EMULATION_NONE, controlno); break; case DPAD_EMULATION_RSTICK: - g_settings.input.dpad_emulation[controlno] = DPAD_EMULATION_LSTICK; - input_xinput.set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[controlno], controlno); + input_xinput.set_analog_dpad_mapping(0, DPAD_EMULATION_LSTICK, controlno); break; } break; @@ -294,12 +292,10 @@ HRESULT CRetroArchControls::OnControlNavigate( switch(g_settings.input.dpad_emulation[controlno]) { case DPAD_EMULATION_NONE: - g_settings.input.dpad_emulation[controlno] = DPAD_EMULATION_LSTICK; - input_xinput.set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[controlno], controlno); + input_xinput.set_analog_dpad_mapping(0, DPAD_EMULATION_LSTICK, controlno); break; case DPAD_EMULATION_LSTICK: - g_settings.input.dpad_emulation[controlno] = DPAD_EMULATION_RSTICK; - input_xinput.set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[controlno], controlno); + input_xinput.set_analog_dpad_mapping(0, DPAD_EMULATION_RSTICK, controlno); break; case DPAD_EMULATION_RSTICK: break; diff --git a/xdk/xdk_xinput_input.c b/xdk/xdk_xinput_input.c index 5e6b51e9b2..0f7b7c04c4 100644 --- a/xdk/xdk_xinput_input.c +++ b/xdk/xdk_xinput_input.c @@ -254,18 +254,21 @@ static void xinput_input_set_analog_dpad_mapping(unsigned device, unsigned map_d switch(map_dpad_enum) { case DPAD_EMULATION_NONE: + g_settings.input.dpad_emulation[controller_id] = DPAD_EMULATION_NONE; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[XDK_DEVICE_ID_JOYPAD_UP].joykey; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[XDK_DEVICE_ID_JOYPAD_DOWN].joykey; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[XDK_DEVICE_ID_JOYPAD_LEFT].joykey; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[XDK_DEVICE_ID_JOYPAD_RIGHT].joykey; break; case DPAD_EMULATION_LSTICK: + g_settings.input.dpad_emulation[controller_id] = DPAD_EMULATION_LSTICK; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[XDK_DEVICE_ID_LSTICK_UP_DPAD].joykey; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[XDK_DEVICE_ID_LSTICK_DOWN_DPAD].joykey; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[XDK_DEVICE_ID_LSTICK_LEFT_DPAD].joykey; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[XDK_DEVICE_ID_LSTICK_RIGHT_DPAD].joykey; break; case DPAD_EMULATION_RSTICK: + g_settings.input.dpad_emulation[controller_id] = DPAD_EMULATION_RSTICK; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[XDK_DEVICE_ID_RSTICK_UP_DPAD].joykey; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[XDK_DEVICE_ID_RSTICK_DOWN_DPAD].joykey; g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[XDK_DEVICE_ID_RSTICK_LEFT_DPAD].joykey;