summaryrefslogtreecommitdiffstats
path: root/src/Pad.cpp
diff options
context:
space:
mode:
author_AG <gennariarmando@outlook.com>2019-06-26 23:31:12 +0200
committer_AG <gennariarmando@outlook.com>2019-06-26 23:32:08 +0200
commit69ac8bcd7acb44a9c6dbd06680e7d90935363467 (patch)
tree3227fc531c31d469d9da06bae350177d01fd2890 /src/Pad.cpp
parentbla (diff)
downloadre3-69ac8bcd7acb44a9c6dbd06680e7d90935363467.tar
re3-69ac8bcd7acb44a9c6dbd06680e7d90935363467.tar.gz
re3-69ac8bcd7acb44a9c6dbd06680e7d90935363467.tar.bz2
re3-69ac8bcd7acb44a9c6dbd06680e7d90935363467.tar.lz
re3-69ac8bcd7acb44a9c6dbd06680e7d90935363467.tar.xz
re3-69ac8bcd7acb44a9c6dbd06680e7d90935363467.tar.zst
re3-69ac8bcd7acb44a9c6dbd06680e7d90935363467.zip
Diffstat (limited to '')
-rw-r--r--src/Pad.cpp24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/Pad.cpp b/src/Pad.cpp
index 61b7ed06..2e3f1c53 100644
--- a/src/Pad.cpp
+++ b/src/Pad.cpp
@@ -1674,30 +1674,26 @@ int16 CPad::SniperModeLookUpDown(void)
int16 CPad::LookAroundLeftRight(void)
{
- float axis = GetPad(0)->NewState.RightStickX;
+ int16 axis = NewState.RightStickX;
- if ( fabs(axis) > 85 && !GetLookBehindForPed() )
- return (int16) ( (axis + ( axis > 0 ) ? -85 : 85)
- * (127.0f / 32.0f) ); // 3.96875f
+ if ( fabs(axis) > 65 && !GetLookBehindForPed() )
+ return ((axis > 0 ? axis - 65 : axis + 65) * ((255 - 65) / (127 - 32)));
- else if ( TheCamera.Cams[0].Using3rdPersonMouseCam() && fabs(axis) > 10 )
- return (int16) ( (axis + ( axis > 0 ) ? -10 : 10)
- * (127.0f / 64.0f) ); // 1.984375f
+ else if (TheCamera.Cams[0].Using3rdPersonMouseCam() && fabs(axis) > 10)
+ return (axis);
return 0;
}
int16 CPad::LookAroundUpDown(void)
{
- int16 axis = GetPad(0)->NewState.RightStickY;
+ int16 axis = NewState.RightStickY;
- if ( abs(axis) > 85 && !GetLookBehindForPed() )
- return (int16) ( (axis + ( axis > 0 ) ? -85 : 85)
- * (127.0f / 32.0f) ); // 3.96875f
+ if (fabs(axis) > 65 && !GetLookBehindForPed())
+ return ((axis > 0 ? axis - 65 : axis + 65) * ((255 - 65) / (127 - 32)));
- else if ( TheCamera.Cams[0].Using3rdPersonMouseCam() && abs(axis) > 40 )
- return (int16) ( (axis + ( axis > 0 ) ? -40 : 40)
- * (127.0f / 64.0f) ); // 1.984375f
+ else if (TheCamera.Cams[0].Using3rdPersonMouseCam() && fabs(axis) > 10)
+ return (axis);
return 0;
}