mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-09-12 12:27:45 +02:00
controllers/npad: Fix inconsistencies with controller connection statuses
This commit is contained in:
parent
334ef2efdd
commit
eb149ec696
@ -393,6 +393,7 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
|
|||||||
break;
|
break;
|
||||||
case NPadControllerType::Handheld:
|
case NPadControllerType::Handheld:
|
||||||
handheld_entry.connection_status.raw = 0;
|
handheld_entry.connection_status.raw = 0;
|
||||||
|
handheld_entry.connection_status.IsConnected.Assign(1);
|
||||||
handheld_entry.connection_status.IsWired.Assign(1);
|
handheld_entry.connection_status.IsWired.Assign(1);
|
||||||
handheld_entry.connection_status.IsLeftJoyConnected.Assign(1);
|
handheld_entry.connection_status.IsLeftJoyConnected.Assign(1);
|
||||||
handheld_entry.connection_status.IsRightJoyConnected.Assign(1);
|
handheld_entry.connection_status.IsRightJoyConnected.Assign(1);
|
||||||
@ -423,21 +424,26 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
|
|||||||
case NPadControllerType::JoyLeft:
|
case NPadControllerType::JoyLeft:
|
||||||
left_entry.connection_status.raw = 0;
|
left_entry.connection_status.raw = 0;
|
||||||
left_entry.connection_status.IsConnected.Assign(1);
|
left_entry.connection_status.IsConnected.Assign(1);
|
||||||
|
left_entry.connection_status.IsLeftJoyConnected.Assign(1);
|
||||||
left_entry.pad.pad_states.raw = pad_state.pad_states.raw;
|
left_entry.pad.pad_states.raw = pad_state.pad_states.raw;
|
||||||
left_entry.pad.l_stick = pad_state.l_stick;
|
left_entry.pad.l_stick = pad_state.l_stick;
|
||||||
left_entry.pad.r_stick = pad_state.r_stick;
|
left_entry.pad.r_stick = pad_state.r_stick;
|
||||||
|
|
||||||
|
libnx_entry.connection_status.IsLeftJoyConnected.Assign(1);
|
||||||
break;
|
break;
|
||||||
case NPadControllerType::JoyRight:
|
case NPadControllerType::JoyRight:
|
||||||
right_entry.connection_status.raw = 0;
|
right_entry.connection_status.raw = 0;
|
||||||
right_entry.connection_status.IsConnected.Assign(1);
|
right_entry.connection_status.IsConnected.Assign(1);
|
||||||
|
right_entry.connection_status.IsRightJoyConnected.Assign(1);
|
||||||
right_entry.pad.pad_states.raw = pad_state.pad_states.raw;
|
right_entry.pad.pad_states.raw = pad_state.pad_states.raw;
|
||||||
right_entry.pad.l_stick = pad_state.l_stick;
|
right_entry.pad.l_stick = pad_state.l_stick;
|
||||||
right_entry.pad.r_stick = pad_state.r_stick;
|
right_entry.pad.r_stick = pad_state.r_stick;
|
||||||
|
|
||||||
|
libnx_entry.connection_status.IsRightJoyConnected.Assign(1);
|
||||||
break;
|
break;
|
||||||
case NPadControllerType::Pokeball:
|
case NPadControllerType::Pokeball:
|
||||||
pokeball_entry.connection_status.raw = 0;
|
pokeball_entry.connection_status.raw = 0;
|
||||||
pokeball_entry.connection_status.IsConnected.Assign(1);
|
pokeball_entry.connection_status.IsConnected.Assign(1);
|
||||||
pokeball_entry.connection_status.IsWired.Assign(1);
|
|
||||||
pokeball_entry.pad.pad_states.raw = pad_state.pad_states.raw;
|
pokeball_entry.pad.pad_states.raw = pad_state.pad_states.raw;
|
||||||
pokeball_entry.pad.l_stick = pad_state.l_stick;
|
pokeball_entry.pad.l_stick = pad_state.l_stick;
|
||||||
pokeball_entry.pad.r_stick = pad_state.r_stick;
|
pokeball_entry.pad.r_stick = pad_state.r_stick;
|
||||||
|
Loading…
Reference in New Issue
Block a user