diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-07-24 18:55:09 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-07-24 18:55:12 -0400 |
| commit | 6186a293f697c2b1f629e2cda04652fbafaa14bb (patch) | |
| tree | 1cdf7842dad2580e0e6216b7e8fa5d84bb2598f9 /Source | |
| parent | e91db62f1be2eeeb3fb3d5f71cfafcfcb98e13a5 (diff) | |
InputCommon: Include the algorithm header in ForceFeedbackDevice
Also simplified the casting within a std::max call
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp index 57abcb1b1f..80b1ac4fd7 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include <algorithm> #include <string> #include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h" @@ -67,7 +68,7 @@ bool ForceFeedbackDevice::InitForceFeedback(const LPDIRECTINPUTDEVICE8 device, i eff.dwGain = DI_FFNOMINALMAX; eff.dwTriggerButton = DIEB_NOTRIGGER; eff.dwTriggerRepeatInterval = 0; - eff.cAxes = std::min((DWORD)1, (DWORD)cAxes); + eff.cAxes = std::min<DWORD>(1, cAxes); eff.rgdwAxes = rgdwAxes; eff.rglDirection = rglDirection; |
