diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-06-07 14:49:25 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-06-07 14:49:25 +0200 |
commit | d0213e466c02974b5aaba0d1fad334ff9281f6cc (patch) | |
tree | 646a365192fda1be95720daaf219398f2148fb1b /src/peds | |
parent | some stats tweaks; saves dead again (diff) | |
download | re3-d0213e466c02974b5aaba0d1fad334ff9281f6cc.tar re3-d0213e466c02974b5aaba0d1fad334ff9281f6cc.tar.gz re3-d0213e466c02974b5aaba0d1fad334ff9281f6cc.tar.bz2 re3-d0213e466c02974b5aaba0d1fad334ff9281f6cc.tar.lz re3-d0213e466c02974b5aaba0d1fad334ff9281f6cc.tar.xz re3-d0213e466c02974b5aaba0d1fad334ff9281f6cc.tar.zst re3-d0213e466c02974b5aaba0d1fad334ff9281f6cc.zip |
Diffstat (limited to 'src/peds')
-rw-r--r-- | src/peds/Ped.cpp | 11 | ||||
-rw-r--r-- | src/peds/Ped.h | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 961b8f61..744ba793 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -3770,7 +3770,8 @@ CPed::ClearAll(void) bIsPointingGunAt = false; bRenderPedInCar = true; bKnockedUpIntoAir = false; - b158_4 = false; + bCrouchWhenScared = false; + bKnockedOffBike = false; m_pCollidingEntity = nil; } @@ -7054,7 +7055,7 @@ CPed::Fall(void) CAnimBlendAssociation *firstPartialAssoc; CAnimBlendAssociation *fallAssoc; - if (IsPlayer() && (bKnockedUpIntoAir || b158_4) && !bIsStanding) { + if (IsPlayer() && (bKnockedUpIntoAir || bKnockedOffBike) && !bIsStanding) { firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL); // What??? @@ -7082,7 +7083,7 @@ CPed::Fall(void) } else { CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_BACK, 8.0f); } - } else if ((bKnockedUpIntoAir || b158_4) && bIsStanding && !bWasStanding) { + } else if ((bKnockedUpIntoAir || bKnockedOffBike) && bIsStanding && !bWasStanding) { fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_BACK); if (!fallAssoc) @@ -7090,7 +7091,7 @@ CPed::Fall(void) if (fallAssoc) { bKnockedUpIntoAir = false; - b158_4 = false; + bKnockedOffBike = false; fallAssoc->speed = 3.0f; if (IsPlayer()) Say(SOUND_PED_LAND); @@ -7099,7 +7100,7 @@ CPed::Fall(void) firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL); if (firstPartialAssoc && !firstPartialAssoc->IsRunning()) { bKnockedUpIntoAir = false; - b158_4 = false; + bKnockedOffBike = false; } } } diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 8aead855..673c70b0 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -473,8 +473,8 @@ public: uint32 bIgnoreThreatsBehindObjects : 1; uint32 bNeverEverTargetThisPed : 1; - //uint32 b158_2 - uint32 b158_4 : 1; + uint32 bCrouchWhenScared : 1; + uint32 bKnockedOffBike : 1; //uint32 b158_8 //uint32 b158_10 uint32 bBoughtIceCream : 1; |