diff options
| author | Pringo <Pringo@users.noreply.github.com> | 2014-11-24 21:54:15 -0800 |
|---|---|---|
| committer | Pringo <Pringo@users.noreply.github.com> | 2014-11-24 21:54:15 -0800 |
| commit | 670d94967a64b6a3e99127caf5511b07825f21cb (patch) | |
| tree | e83e2909a2db5dbe8387a40f3839d27abf588c0c /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 5a89ba20d75b17b1aeec090544934b95bdb0ec74 (diff) | |
| parent | 245ff601b7033f4122b48d837171c21baa9ac306 (diff) | |
Merge pull request #1 from dolphin-emu/master
update
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index ec2973f3d3..e75df76a36 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -31,7 +31,7 @@ using namespace ciface::ExpressionParser; namespace { -const float INPUT_DETECT_THRESHOLD = 0.55f; +const ControlState INPUT_DETECT_THRESHOLD = 0.55; } ControllerInterface g_controller_interface; @@ -194,7 +194,7 @@ ControlState ControllerInterface::InputReference::State( const ControlState igno if (parsed_expression) return parsed_expression->GetValue() * range; else - return 0.0f; + return 0.0; } // @@ -208,7 +208,7 @@ ControlState ControllerInterface::OutputReference::State(const ControlState stat { if (parsed_expression) parsed_expression->SetValue(state); - return 0.0f; + return 0.0; } // |