diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-11 18:42:54 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-01-11 18:43:04 +0100 |
| commit | 4a8a1af8858edeef949d8f2ecbd25d3c93ccd042 (patch) | |
| tree | 75ec362ea1d1d0ca7d3198c025e373a147dc2a81 /src | |
| parent | fixes (diff) | |
| download | re3-4a8a1af8858edeef949d8f2ecbd25d3c93ccd042.tar re3-4a8a1af8858edeef949d8f2ecbd25d3c93ccd042.tar.gz re3-4a8a1af8858edeef949d8f2ecbd25d3c93ccd042.tar.bz2 re3-4a8a1af8858edeef949d8f2ecbd25d3c93ccd042.tar.lz re3-4a8a1af8858edeef949d8f2ecbd25d3c93ccd042.tar.xz re3-4a8a1af8858edeef949d8f2ecbd25d3c93ccd042.tar.zst re3-4a8a1af8858edeef949d8f2ecbd25d3c93ccd042.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/Wanted.h | 1 | ||||
| -rw-r--r-- | src/peds/Ped.h | 7 | ||||
| -rw-r--r-- | src/vehicles/Automobile.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/core/Wanted.h b/src/core/Wanted.h index 057b5407..f2da23e3 100644 --- a/src/core/Wanted.h +++ b/src/core/Wanted.h @@ -41,6 +41,7 @@ public: int32 NumOfHelisRequired(); void SetWantedLevel(int32); void SetWantedLevelNoDrop(int32 level); + int32 GetWantedLevel() { return m_nWantedLevel; } void CheatWantedLevel(int32 level); void RegisterCrime(eCrimeType type, const CVector &coors, uint32 id, bool policeDoesntCare); void RegisterCrime_Immediately(eCrimeType type, const CVector &coors, uint32 id, bool policeDoesntCare); diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 6c0d9987..7798483f 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -492,10 +492,15 @@ public: uint32 bDonePositionOutOfCollision : 1; uint32 bCanAttackPlayerWithCops : 1; +#ifdef KANGAROO_CHEAT // our own flags uint32 m_ped_flagI80 : 1; // KANGAROO_CHEAT define makes use of this as cheat toggle +#endif uint8 m_gangFlags; + uint8 m_unused15D; // these 3 can't be padding but had to actually have been members ... + uint8 m_unused15E; + uint8 m_unused15F; uint8 CharCreatedBy; eObjective m_objective; eObjective m_prevObjective; @@ -536,7 +541,7 @@ public: uint32 m_pathNodeTimer; CPathNode m_pathNodeObjPool[8]; CPathNode* m_pCurPathNode; - char m_nPathDir; + int8 m_nPathDir; CPathNode* m_pLastPathNode; CPathNode* m_pNextPathNode; CVector m_followPathDestPos; diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 3a0121ec..65e3f313 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -288,7 +288,7 @@ CAutomobile::ProcessControl(void) // Improve grip of vehicles in certain cases bool strongGrip1 = false; bool strongGrip2 = false; - if(FindPlayerVehicle() && this != FindPlayerVehicle() && FindPlayerPed()->m_pWanted->m_nWantedLevel > 3 && + if(FindPlayerVehicle() && this != FindPlayerVehicle() && FindPlayerPed()->m_pWanted->GetWantedLevel() > 3 && (AutoPilot.m_nCarMission == MISSION_RAMPLAYER_FARAWAY || AutoPilot.m_nCarMission == MISSION_RAMPLAYER_CLOSE || AutoPilot.m_nCarMission == MISSION_BLOCKPLAYER_FARAWAY || AutoPilot.m_nCarMission == MISSION_BLOCKPLAYER_CLOSE) && FindPlayerSpeed().Magnitude() > 0.3f){ |