diff options
author | aap <aap@papnet.eu> | 2020-02-23 11:00:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-23 11:00:15 +0100 |
commit | f8cd12ffb325d6bc374357a57125fa53778abf0a (patch) | |
tree | d3e4a0b7193d75b559b82c43f4fe504baac45f7e /src/peds | |
parent | Merge pull request #334 from erorcun/erorcun (diff) | |
parent | ARRAY_SIZE (diff) | |
download | re3-f8cd12ffb325d6bc374357a57125fa53778abf0a.tar re3-f8cd12ffb325d6bc374357a57125fa53778abf0a.tar.gz re3-f8cd12ffb325d6bc374357a57125fa53778abf0a.tar.bz2 re3-f8cd12ffb325d6bc374357a57125fa53778abf0a.tar.lz re3-f8cd12ffb325d6bc374357a57125fa53778abf0a.tar.xz re3-f8cd12ffb325d6bc374357a57125fa53778abf0a.tar.zst re3-f8cd12ffb325d6bc374357a57125fa53778abf0a.zip |
Diffstat (limited to 'src/peds')
-rw-r--r-- | src/peds/PedType.h | 3 | ||||
-rw-r--r-- | src/peds/Population.cpp | 2 | ||||
-rw-r--r-- | src/peds/Population.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/peds/PedType.h b/src/peds/PedType.h index 4c962644..1f3ecb59 100644 --- a/src/peds/PedType.h +++ b/src/peds/PedType.h @@ -85,6 +85,9 @@ public: static uint32 GetFlag(int type) { return ms_apPedType[type]->m_flag; } static uint32 GetAvoid(int type) { return ms_apPedType[type]->m_avoid; } static uint32 GetThreats(int type) { return ms_apPedType[type]->m_threats; } + static void AddThreat(int type, int threat) { ms_apPedType[type]->m_threats |= threat; } + static void RemoveThreat(int type, int threat) { ms_apPedType[type]->m_threats &= ~threat; } + static bool IsThreat(int type, int threat) { return ms_apPedType[type]->m_threats & threat; } }; static_assert(sizeof(CPedType) == 0x20, "CPedType: error"); diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index a168198b..a2dd5c38 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -16,6 +16,7 @@ #include "IniFile.h" #include "VisibilityPlugins.h" #include "PedPlacement.h" +#include "DummyObject.h" #define CREATION_DIST_MULT_TO_DIST 40.0f #define CREATION_RANGE 10.0f // Being added over the CREATION_DIST_MULT_TO_DIST. @@ -58,6 +59,7 @@ CVector &CPopulation::RegenerationForward = *(CVector*)0x8F1AD4; WRAPPER CPed *CPopulation::AddPedInCar(CVehicle *vehicle) { EAXJMP(0x4F5800); } WRAPPER void CPopulation::ManagePopulation(void) { EAXJMP(0x4F3B90); } WRAPPER void CPopulation::MoveCarsAndPedsOutOfAbandonedZones(void) { EAXJMP(0x4F5BE0); } +WRAPPER void CPopulation::ConvertToRealObject(CDummyObject* obj) { EAXJMP(0x4F45A0); } void CPopulation::Initialise() diff --git a/src/peds/Population.h b/src/peds/Population.h index d39fb209..f22926a0 100644 --- a/src/peds/Population.h +++ b/src/peds/Population.h @@ -6,6 +6,7 @@ class CPed; class CVehicle; +class CDummyObject; struct PedGroup { @@ -80,4 +81,5 @@ public: static void AddToPopulation(float, float, float, float); static void ManagePopulation(void); static void MoveCarsAndPedsOutOfAbandonedZones(void); + static void ConvertToRealObject(CDummyObject* obj); }; |