From 2953cf201dc5f00ca79f1c16cbd62136097ff77f Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 17 Apr 2018 22:40:11 +0200 Subject: Remove Hybrid Wii Remote It simply doesn't seem to work for anything useful, and nobody seems to care about maintaining it. --- Source/Core/DolphinWX/ControllerConfigDiag.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp') diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index dbc91c0b8d..2e223725c1 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -94,8 +94,7 @@ void ControllerConfigDiag::UpdateUI() SConfig::GetInstance().bWii || Core::GetState() == Core::State::Uninitialized; if (Core::WantsDeterminism() || !wii_game_started) m_wiimote_sources[i]->Disable(); - if (!wii_game_started || - (g_wiimote_sources[i] != WIIMOTE_SRC_EMU && g_wiimote_sources[i] != WIIMOTE_SRC_HYBRID)) + if (!wii_game_started || g_wiimote_sources[i] != WIIMOTE_SRC_EMU) m_wiimote_configure_button[i]->Disable(); } @@ -309,8 +308,8 @@ wxSizer* ControllerConfigDiag::CreatePassthroughBTConfigSizer() wxSizer* ControllerConfigDiag::CreateEmulatedBTConfigSizer() { - const std::array src_choices{ - {_("None"), _("Emulated Wii Remote"), _("Real Wii Remote"), _("Hybrid Wii Remote")}}; + const std::array src_choices{ + {_("None"), _("Emulated Wii Remote"), _("Real Wii Remote")}}; const int space5 = FromDIP(5); @@ -507,11 +506,7 @@ void ControllerConfigDiag::OnWiimoteSourceChanged(wxCommandEvent& event) if (index != WIIMOTE_BALANCE_BOARD) { WiimoteReal::ChangeWiimoteSource(index, event.GetInt()); - if (g_wiimote_sources[index] != WIIMOTE_SRC_EMU && - g_wiimote_sources[index] != WIIMOTE_SRC_HYBRID) - m_wiimote_configure_button[index]->Disable(); - else - m_wiimote_configure_button[index]->Enable(); + m_wiimote_configure_button[index]->Enable(g_wiimote_sources[index] == WIIMOTE_SRC_EMU); } else { -- cgit v1.2.3