mirrors/re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #60 from erorcun/erorcun

Browse Source 
Fix 3 bugs
This commit is contained in:
aap 2019-06-27 09:46:41 +02:00 committed by GitHub
commit 62b6788dc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Pad.cpp
View File

@ -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;

2
src/animation/RpAnimBlend.cpp
View File

@ -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;
}

2
src/entities/Ped.cpp
View File

@ -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;