From e1f8c5419f2e539af4bfc68ddae294c66965f6b5 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke <grumbel@gmx.de>
Date: Sat, 29 Jan 2011 22:40:50 +0100
Subject: [PATCH] Fixed set_axis_float() for XBOX_AXIS_TRIGGER
---
src/xboxmsg.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xboxmsg.cpp b/src/xboxmsg.cpp
index 4c43f8a..659f9fa 100644
--- a/src/xboxmsg.cpp
+++ b/src/xboxmsg.cpp
@@ -850,8 +850,8 @@ void set_axis_float(XboxGenericMsg& msg, XboxAxis axis, float v)
break;
case XBOX_AXIS_TRIGGER:
- msg.xbox360.lt = v < 0 ? int(v*255) : 0;
- msg.xbox360.rt = v > 0 ? int(v*255) : 0;
+ msg.xbox360.lt = v < 0 ? static_cast<int>(-v*255) : 0;
+ msg.xbox360.rt = v > 0 ? static_cast<int>(v*255) : 0;
break;
case XBOX_AXIS_DPAD_X:
@@ -914,8 +914,8 @@ void set_axis_float(XboxGenericMsg& msg, XboxAxis axis, float v)
break;
case XBOX_AXIS_TRIGGER:
- msg.xbox.lt = v < 0 ? int(v*255) : 0;
- msg.xbox.rt = v > 0 ? int(v*255) : 0;
+ msg.xbox.lt = v < 0 ? static_cast<int>(-v*255) : 0;
+ msg.xbox.rt = v > 0 ? static_cast<int>(v*255) : 0;
break;
case XBOX_AXIS_DPAD_X:
@@ -978,8 +978,8 @@ void set_axis_float(XboxGenericMsg& msg, XboxAxis axis, float v)
break;
case XBOX_AXIS_TRIGGER:
- msg.ps3usb.a_l2 = v < 0 ? int(v*255) : 0;
- msg.ps3usb.a_r2 = v > 0 ? int(v*255) : 0;
+ msg.ps3usb.a_l2 = v < 0 ? static_cast<int>(-v*255) : 0;
+ msg.ps3usb.a_r2 = v > 0 ? static_cast<int>(v*255) : 0;
break;
case XBOX_AXIS_DPAD_X: