summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorRachel Bryk <RachelBryk@gmail.com>2013-09-17 09:56:45 -0400
committerRachel Bryk <RachelBryk@gmail.com>2013-09-17 09:56:45 -0400
commitec5cf60f5eafcb8d1ff7231af21267e0ed3d414a (patch)
tree23599ffac860e22ff36b53cd93f3b24df2848955 /Source/Core
parent302e9c891b66173fa47e4d9363c7f09b6d46f3be (diff)
Set L/R buttons in tas input, instead of just the analog triggers.
Fixes issue 6613.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/TASInputDlg.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index e3db56e7fb..2bae92287b 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -527,6 +527,16 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
PadStatus->button |= PAD_BUTTON_START;
else
PadStatus->button &= ~PAD_BUTTON_START;
+
+ if(wx_r_button->IsChecked() || rTrig >= 255)
+ PadStatus->button |= PAD_TRIGGER_R;
+ else
+ PadStatus->button &= ~PAD_TRIGGER_R;
+
+ if(wx_l_button->IsChecked() || lTrig >= 255)
+ PadStatus->button |= PAD_TRIGGER_L;
+ else
+ PadStatus->button &= ~PAD_TRIGGER_L;
ButtonTurbo();
}