Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #668 from lioncash/include
InputCommon: Include the algorithm header in ForceFeedbackDevice
  • Loading branch information
delroth committed Jul 24, 2014
2 parents e91db62 + 6186a29 commit e3dde59
Showing 1 changed file with 2 additions and 1 deletion.
Expand Up @@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <algorithm>
#include <string>
#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit e3dde59

Please sign in to comment.