From 6186a293f697c2b1f629e2cda04652fbafaa14bb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 24 Jul 2014 18:55:09 -0400 Subject: [PATCH] InputCommon: Include the algorithm header in ForceFeedbackDevice Also simplified the casting within a std::max call --- .../ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 #include #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(1, cAxes); eff.rgdwAxes = rgdwAxes; eff.rglDirection = rglDirection;