From c41b31d3ffed348909c3dca9e71318558f1af803 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sun, 14 Sep 2014 23:42:32 -0400 Subject: Add wiimote tas input. --- Source/Core/DolphinWX/FrameTools.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/FrameTools.cpp') diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 94db9866b0..b26d9555e0 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -699,11 +699,18 @@ void CFrame::OnTASInput(wxCommandEvent& event) for (int i = 0; i < 4; ++i) { - if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) + if (SConfig::GetInstance().m_SIDevice[i] != SIDEVICE_NONE && SConfig::GetInstance().m_SIDevice[i] != SIDEVICE_GC_GBA) { + g_TASInputDlg[i]->CreateGCLayout(); g_TASInputDlg[i]->Show(true); g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]); } + if (g_wiimote_sources[i] == WIIMOTE_SRC_EMU && !(Core::IsRunning() && !SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)) + { + g_TASInputDlg[i+4]->CreateWiiLayout(); + g_TASInputDlg[i+4]->Show(true); + g_TASInputDlg[i+4]->SetTitle("TAS Input - Wiimote " + number[i]); + } } } -- cgit v1.2.3