summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-06-27 05:30:29 +0200
committereray orçunus <erayorcunus@gmail.com>2019-06-27 05:30:29 +0200
commitb8862cf59c8cc5979577f3a4592908239ce26a07 (patch)
tree09e3a33c1f32bf66232aacf8b08b086e236a272b /src
parentMerge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff)
downloadre3-b8862cf59c8cc5979577f3a4592908239ce26a07.tar
re3-b8862cf59c8cc5979577f3a4592908239ce26a07.tar.gz
re3-b8862cf59c8cc5979577f3a4592908239ce26a07.tar.bz2
re3-b8862cf59c8cc5979577f3a4592908239ce26a07.tar.lz
re3-b8862cf59c8cc5979577f3a4592908239ce26a07.tar.xz
re3-b8862cf59c8cc5979577f3a4592908239ce26a07.tar.zst
re3-b8862cf59c8cc5979577f3a4592908239ce26a07.zip
Diffstat (limited to 'src')
-rw-r--r--src/Pad.cpp8
-rw-r--r--src/animation/RpAnimBlend.cpp2
-rw-r--r--src/entities/Ped.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Pad.cpp b/src/Pad.cpp
index 61b7ed06..e6f36efd 100644
--- a/src/Pad.cpp
+++ b/src/Pad.cpp
@@ -1677,11 +1677,11 @@ int16 CPad::LookAroundLeftRight(void)
float axis = GetPad(0)->NewState.RightStickX;
if ( fabs(axis) > 85 && !GetLookBehindForPed() )
- return (int16) ( (axis + ( axis > 0 ) ? -85 : 85)
+ return (int16) ( (axis + ( ( axis > 0 ) ? -85 : 85) )
* (127.0f / 32.0f) ); // 3.96875f
else if ( TheCamera.Cams[0].Using3rdPersonMouseCam() && fabs(axis) > 10 )
- return (int16) ( (axis + ( axis > 0 ) ? -10 : 10)
+ return (int16) ( (axis + ( ( axis > 0 ) ? -10 : 10) )
* (127.0f / 64.0f) ); // 1.984375f
return 0;
@@ -1692,11 +1692,11 @@ int16 CPad::LookAroundUpDown(void)
int16 axis = GetPad(0)->NewState.RightStickY;
if ( abs(axis) > 85 && !GetLookBehindForPed() )
- return (int16) ( (axis + ( axis > 0 ) ? -85 : 85)
+ return (int16) ( (axis + ( ( axis > 0 ) ? -85 : 85) )
* (127.0f / 32.0f) ); // 3.96875f
else if ( TheCamera.Cams[0].Using3rdPersonMouseCam() && abs(axis) > 40 )
- return (int16) ( (axis + ( axis > 0 ) ? -40 : 40)
+ return (int16) ( (axis + ( ( axis > 0 ) ? -40 : 40) )
* (127.0f / 64.0f) ); // 1.984375f
return 0;
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp
index 9d5e2162..3d1439c6 100644
--- a/src/animation/RpAnimBlend.cpp
+++ b/src/animation/RpAnimBlend.cpp
@@ -48,7 +48,7 @@ CAnimBlendAssociation*
RpAnimBlendGetNextAssociation(CAnimBlendAssociation *assoc)
{
if(assoc->link.next)
- CAnimBlendAssociation::FromLink(assoc->link.next);
+ return CAnimBlendAssociation::FromLink(assoc->link.next);
return nil;
}
diff --git a/src/entities/Ped.cpp b/src/entities/Ped.cpp
index c4109312..4f5147b9 100644
--- a/src/entities/Ped.cpp
+++ b/src/entities/Ped.cpp
@@ -249,7 +249,7 @@ CheckForPedsOnGroundToAttack(CPlayerPed *player, CPed **pedOnGround)
foundDead = 1;
if (!deadPed)
deadPed = (CPed*)currentPed;
- } else if (currentPed->IsPedHeadAbovePos(-0.6f)) {
+ } else if (!currentPed->IsPedHeadAbovePos(-0.6f)) {
foundOnTheFloor = 1;
if (!pedOnTheFloor)
pedOnTheFloor = (CPed*)currentPed;