summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp')
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index d2982bba24..bc1e115c17 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -178,11 +178,11 @@ bool ControllerInterface::UpdateOutput(const bool force)
size_t ok_count = 0;
- std::vector<Device*>::const_iterator
- d = m_devices.begin(),
- e = m_devices.end();
- for (;d != e; ++d)
- (*d)->UpdateOutput();
+ for (auto d = m_devices.cbegin(); d != m_devices.cend(); ++d)
+ {
+ if ((*d)->UpdateOutput())
+ ++ok_count;
+ }
return (m_devices.size() == ok_count);
}
@@ -196,7 +196,7 @@ bool ControllerInterface::UpdateOutput(const bool force)
ControlState ControllerInterface::InputReference::State( const ControlState ignore )
{
if (parsed_expression)
- return parsed_expression->GetValue();
+ return parsed_expression->GetValue() * range;
else
return 0.0f;
}