diff options
| author | skidau <skidau@gmail.com> | 2014-11-15 23:31:47 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-11-15 23:31:47 +1100 |
| commit | cf8035e24017782635f20bd564a9cb6aee37b136 (patch) | |
| tree | 495f0bb98d56312514620ebdee041e8ffc3c9019 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | e47bfc2788f4ff166ee088e92aee0763b0d55647 (diff) | |
| parent | e9cb629723bb0fabbad130c2a63b3cdbaaf8ba6a (diff) | |
Merge pull request #1521 from RachelBryk/double
Fix some double->float conversions.
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; } // |