summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
diff options
context:
space:
mode:
authorRachel Bryk <RachelBryk@gmail.com>2014-11-09 15:02:18 -0500
committerRachel Bryk <RachelBryk@gmail.com>2014-11-11 14:14:22 -0500
commite9cb629723bb0fabbad130c2a63b3cdbaaf8ba6a (patch)
treee63ba5755800e9ab82a6314ba8e9f368cbd23a67 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
parent71d8165a8649cde73663b1534bbdd6094faecf2d (diff)
Fix some double->float conversions.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp6
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;
}
//