diff options
| author | aap <aap@papnet.eu> | 2019-08-28 12:58:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 12:58:42 +0200 |
| commit | 792893df594b8cd09d7e9e8486148aa0126eef3a (patch) | |
| tree | f775059bd6cd968b096f989243e496bea776ae4f /src/peds | |
| parent | Merge pull request #197 from Nick007J/master (diff) | |
| parent | Audio fixes (diff) | |
| download | re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.gz re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.bz2 re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.lz re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.xz re3-792893df594b8cd09d7e9e8486148aa0126eef3a.tar.zst re3-792893df594b8cd09d7e9e8486148aa0126eef3a.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.cpp | 4 | ||||
| -rw-r--r-- | src/peds/Ped.h | 11 | ||||
| -rw-r--r-- | src/peds/PedPlacement.cpp | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 53d94d86..a590c1ed 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -3172,7 +3172,7 @@ CPed::CheckIfInTheAir(void) CEntity *foundEntity; float startZ = pos.z - 1.54f; - bool foundGround = CWorld::ProcessVerticalLine(pos, startZ, foundColPoint, foundEntity, true, true, false, true, false, false, false); + bool foundGround = CWorld::ProcessVerticalLine(pos, startZ, foundColPoint, foundEntity, true, true, false, true, false, false, nil); if (!foundGround && m_nPedState != PED_JUMP) { pos.z -= 1.04f; @@ -4622,7 +4622,7 @@ CPed::LoadFightData(void) // Actually GetLocalDirectionTo(Turn/Look) int -CPed::GetLocalDirection(CVector2D const &posOffset) +CPed::GetLocalDirection(const CVector2D &posOffset) { float direction; diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 5922e0e7..c1e93fdc 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -575,7 +575,7 @@ public: void StartFightAttack(uint8); void SetWaitState(eWaitState, void*); bool FightStrike(CVector&); - int GetLocalDirection(CVector2D const &); + int GetLocalDirection(const CVector2D &); void StartFightDefend(uint8, uint8, uint8); void PlayHitSound(CPed*); void SetFall(int, AnimationId, uint8); @@ -718,6 +718,15 @@ public: #endif }; +class cPedParams +{ +public: + char m_bDistanceCalculated; + char gap_1[3]; + float m_fDistance; + CPed *m_pPed; +}; + void FinishFuckUCB(CAnimBlendAssociation *assoc, void *arg); static_assert(offsetof(CPed, m_nPedState) == 0x224, "CPed: error"); diff --git a/src/peds/PedPlacement.cpp b/src/peds/PedPlacement.cpp index f292f4fa..8a40e56f 100644 --- a/src/peds/PedPlacement.cpp +++ b/src/peds/PedPlacement.cpp @@ -38,7 +38,7 @@ CPedPlacement::FindZCoorForPed(CVector* pos) CEntity* CPedPlacement::IsPositionClearOfCars(CVector* pos) { - return CWorld::TestSphereAgainstWorld(*pos, 0.25f, false, true, true, false, false, false, false); + return CWorld::TestSphereAgainstWorld(*pos, 0.25f, nil, true, true, false, false, false, false); } STARTPATCHES |