diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2013-07-23 20:43:51 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2013-07-23 20:43:51 -0400 |
| commit | 3f03588decc18ddb4441cd6480eb36885eae7f8a (patch) | |
| tree | c9c6ef31df44362842639add44f1476f443b5968 /Source | |
| parent | ec148008d0638ea4eafffd6bf95706e8d3507c5e (diff) | |
Tas input works with bongos too.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.h | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/TASInputDlg.cpp | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 7bfe33c1b6..2891d9931c 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -111,7 +111,7 @@ public: NetPlaySetupDiag* g_NetPlaySetupDiag; wxCheatsWindow* g_CheatsWindow; TASInputDlg* g_TASInputDlg[4]; - + void InitBitmaps(); void DoPause(); void DoStop(); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 5409e98f6a..1c70b4e715 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -649,9 +649,9 @@ void CFrame::OnTASInput(wxCommandEvent& event) { std::string number[4] = {"1","2","3","4"}; - for(int i = 0; i < 4; i++) + for (int i = 0; i < 4; ++i) { - if(SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) { g_TASInputDlg[i]->Show(true); g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]); diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp index c37a369b11..8845eda961 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp @@ -459,10 +459,6 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID) GetKeyBoardInput(PadStatus); SetLandRTriggers(); - // TODO: implement support for more controllers - //if (controllerID != 0) - // return; - PadStatus->stickX = mainX; PadStatus->stickY = mainY; PadStatus->substickX = cX; |