diff options
| author | skidau <skidau@gmail.com> | 2014-10-08 13:15:43 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-08 13:15:43 +1100 |
| commit | 38b64fd0776599fe9112ec398c0379d369b76a3a (patch) | |
| tree | 0751a1ba1402849290df5632fd8697c7bc7aea64 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | ab49d80e3f3c579f6237743bb21f27c51d8d5c3a (diff) | |
| parent | c41b31d3ffed348909c3dca9e71318558f1af803 (diff) | |
Merge pull request #1213 from RachelBryk/wii-tas-input
Add wiimote tas input.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 4da987f7c8..4d73dbf18a 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]); + } } } |