CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

general: Fix handheld typo

master
Morph 2021-11-29 17:22:59 +07:00
parent 04f48f0120
commit 410df5446e
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/service/hid/controllers/npad.cpp
Unescape Escape View File

@ -635,7 +635,7 @@ void Controller_NPad::OnMotionUpdate(const Core::Timing::CoreTiming& core_timing
// This buffer only is updated on handheld on HW // This buffer only is updated on handheld on HW
npad.sixaxis_handheld_lifo.WriteNextEntry(sixaxis_handheld_state); npad.sixaxis_handheld_lifo.WriteNextEntry(sixaxis_handheld_state);
} else { } else {
// Hanheld doesn't update this buffer on HW // Handheld doesn't update this buffer on HW
npad.sixaxis_fullkey_lifo.WriteNextEntry(sixaxis_fullkey_state); npad.sixaxis_fullkey_lifo.WriteNextEntry(sixaxis_fullkey_state);
} }

32
src/yuzu/configuration/configure_input_player.cpp
Unescape Escape View File

@ -246,15 +246,15 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
if (player_index == 0) { if (player_index == 0) {
auto* emulated_controller_p1 = auto* emulated_controller_p1 =
hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
auto* emulated_controller_hanheld = auto* emulated_controller_handheld =
hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
emulated_controller_p1->SaveCurrentConfig(); emulated_controller_p1->SaveCurrentConfig();
emulated_controller_p1->EnableConfiguration(); emulated_controller_p1->EnableConfiguration();
emulated_controller_hanheld->SaveCurrentConfig(); emulated_controller_handheld->SaveCurrentConfig();
emulated_controller_hanheld->EnableConfiguration(); emulated_controller_handheld->EnableConfiguration();
if (emulated_controller_hanheld->IsConnected(true)) { if (emulated_controller_handheld->IsConnected(true)) {
emulated_controller_p1->Disconnect(); emulated_controller_p1->Disconnect();
emulated_controller = emulated_controller_hanheld; emulated_controller = emulated_controller_handheld;
} else { } else {
emulated_controller = emulated_controller_p1; emulated_controller = emulated_controller_p1;
} }
@ -590,19 +590,19 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
if (player_index == 0) { if (player_index == 0) {
auto* emulated_controller_p1 = auto* emulated_controller_p1 =
hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
auto* emulated_controller_hanheld = auto* emulated_controller_handheld =
hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
bool is_connected = emulated_controller->IsConnected(true); bool is_connected = emulated_controller->IsConnected(true);
emulated_controller_p1->SetNpadStyleIndex(type); emulated_controller_p1->SetNpadStyleIndex(type);
emulated_controller_hanheld->SetNpadStyleIndex(type); emulated_controller_handheld->SetNpadStyleIndex(type);
if (is_connected) { if (is_connected) {
if (type == Core::HID::NpadStyleIndex::Handheld) { if (type == Core::HID::NpadStyleIndex::Handheld) {
emulated_controller_p1->Disconnect(); emulated_controller_p1->Disconnect();
emulated_controller_hanheld->Connect(); emulated_controller_handheld->Connect();
emulated_controller = emulated_controller_hanheld; emulated_controller = emulated_controller_handheld;
} else { } else {
emulated_controller_hanheld->Disconnect(); emulated_controller_handheld->Disconnect();
emulated_controller_p1->Connect(); emulated_controller_p1->Connect();
emulated_controller = emulated_controller_p1; emulated_controller = emulated_controller_p1;
} }
@ -650,10 +650,10 @@ ConfigureInputPlayer::~ConfigureInputPlayer() {
if (player_index == 0) { if (player_index == 0) {
auto* emulated_controller_p1 = auto* emulated_controller_p1 =
hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
auto* emulated_controller_hanheld = auto* emulated_controller_handheld =
hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
emulated_controller_p1->DisableConfiguration(); emulated_controller_p1->DisableConfiguration();
emulated_controller_hanheld->DisableConfiguration(); emulated_controller_handheld->DisableConfiguration();
} else { } else {
emulated_controller->DisableConfiguration(); emulated_controller->DisableConfiguration();
} }
@ -663,14 +663,14 @@ void ConfigureInputPlayer::ApplyConfiguration() {
if (player_index == 0) { if (player_index == 0) {
auto* emulated_controller_p1 = auto* emulated_controller_p1 =
hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
auto* emulated_controller_hanheld = auto* emulated_controller_handheld =
hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
emulated_controller_p1->DisableConfiguration(); emulated_controller_p1->DisableConfiguration();
emulated_controller_p1->SaveCurrentConfig(); emulated_controller_p1->SaveCurrentConfig();
emulated_controller_p1->EnableConfiguration(); emulated_controller_p1->EnableConfiguration();
emulated_controller_hanheld->DisableConfiguration(); emulated_controller_handheld->DisableConfiguration();
emulated_controller_hanheld->SaveCurrentConfig(); emulated_controller_handheld->SaveCurrentConfig();
emulated_controller_hanheld->EnableConfiguration(); emulated_controller_handheld->EnableConfiguration();
return; return;
} }
emulated_controller->DisableConfiguration(); emulated_controller->DisableConfiguration();