diff options
author | aap <aap@papnet.eu> | 2020-05-09 12:45:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-09 12:45:25 +0200 |
commit | 40cfd0576fcbc05ee63262d5c41a3151b09a806b (patch) | |
tree | 93f989fb6dfc2b0244d8a38c94c8c5d15e5e9f25 /src/core | |
parent | Merge branch 'master' into miami (diff) | |
parent | fix (diff) | |
download | re3-40cfd0576fcbc05ee63262d5c41a3151b09a806b.tar re3-40cfd0576fcbc05ee63262d5c41a3151b09a806b.tar.gz re3-40cfd0576fcbc05ee63262d5c41a3151b09a806b.tar.bz2 re3-40cfd0576fcbc05ee63262d5c41a3151b09a806b.tar.lz re3-40cfd0576fcbc05ee63262d5c41a3151b09a806b.tar.xz re3-40cfd0576fcbc05ee63262d5c41a3151b09a806b.tar.zst re3-40cfd0576fcbc05ee63262d5c41a3151b09a806b.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/Streaming.cpp | 9 | ||||
-rw-r--r-- | src/core/Wanted.cpp | 6 | ||||
-rw-r--r-- | src/core/Wanted.h | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index b1a73607..eb7fc8f5 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -1396,6 +1396,15 @@ CStreaming::StreamVehiclesAndPeds(void) else SetModelIsDeletable(MI_CHOPPER); + if (FindPlayerPed()->m_pWanted->AreMiamiViceRequired()) { + //TODO(MIAMI): miami vice peds + RequestModel(MI_VICECHEE, STREAMFLAGS_DONT_REMOVE); + } + else { + SetModelIsDeletable(MI_VICECHEE); + //TODO(MIAMI): miami vice peds + } + if(timeBeforeNextLoad >= 0) timeBeforeNextLoad--; else if(ms_numVehiclesLoaded <= desiredNumVehiclesLoaded){ diff --git a/src/core/Wanted.cpp b/src/core/Wanted.cpp index 7508c9f4..ff82edad 100644 --- a/src/core/Wanted.cpp +++ b/src/core/Wanted.cpp @@ -40,6 +40,12 @@ CWanted::Initialise() } bool +CWanted::AreMiamiViceRequired() +{ + return m_nWantedLevel >= 3; +} + +bool CWanted::AreSwatRequired() { return m_nWantedLevel == 4 || m_bSwatRequired; diff --git a/src/core/Wanted.h b/src/core/Wanted.h index e3e407b0..0e0e70c3 100644 --- a/src/core/Wanted.h +++ b/src/core/Wanted.h @@ -31,6 +31,7 @@ public: public: void Initialise(); + bool AreMiamiViceRequired(); bool AreSwatRequired(); bool AreFbiRequired(); bool AreArmyRequired(); |