diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-07-15 12:11:17 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-07-15 12:11:17 -0400 |
| commit | ebd029973a730d6a6d6653621a2565fbdc38e49d (patch) | |
| tree | d438e3232afcfb8b31f9324d87df7ebab759db29 /Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp | |
| parent | 01cd90deef0ebeb1b8960dbdb2952d143f34a60a (diff) | |
| parent | ff918df88991710d58d983aa2e5dbcf03f2064ab (diff) | |
Merge pull request #604 from magcius/wip/emu-cleanup-2
Start cleaning up the input interface
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp index 2261a5df98..da740bbb7e 100644 --- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp @@ -228,12 +228,12 @@ public: virtual ControlState GetValue() override { - return control->ToInput()->GetState(); + return control->ToInput()->GetGatedState(); } virtual void SetValue(ControlState value) override { - control->ToOutput()->SetState(value); + control->ToOutput()->SetGatedState(value); } virtual int CountNumControls() override |