diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-09-03 09:15:51 +0200 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-09-03 09:15:51 +0200 |
| commit | 6e2b873ec1f5c4c404925b9dfbde863fbaec7102 (patch) | |
| tree | 8f20661ee614db586ac23a700a572e52a140f5ed /Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp | |
| parent | db84a22109fc41e0915aca7cee46d43c11d6d0d8 (diff) | |
| parent | 5adbc83453d14b23818442f545ceede0e4548196 (diff) | |
Merge pull request #781 from RachelBryk/ControlState
Change ControlState typedef to double, and change all related floats/dou...
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp index c28356260d..e93b22826d 100644 --- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp @@ -273,7 +273,7 @@ public: case TOK_OR: return std::max(lhsValue, rhsValue); case TOK_ADD: - return std::min(lhsValue + rhsValue, 1.0f); + return std::min(lhsValue + rhsValue, 1.0); default: assert(false); return 0; |