summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-10 11:25:30 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-10 11:25:30 +0200
commit2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e (patch)
tree24ca53597b1ebf632b12fb315ef91e899807d47d /src/core
parentMerge pull request #528 from Nick007J/miami (diff)
downloadre3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.gz
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.bz2
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.lz
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.xz
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.zst
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Streaming.cpp36
1 files changed, 34 insertions, 2 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index eb7fc8f5..cc746553 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1397,12 +1397,44 @@ CStreaming::StreamVehiclesAndPeds(void)
SetModelIsDeletable(MI_CHOPPER);
if (FindPlayerPed()->m_pWanted->AreMiamiViceRequired()) {
- //TODO(MIAMI): miami vice peds
+ SetModelIsDeletable(MI_VICE1);
+ SetModelIsDeletable(MI_VICE2);
+ SetModelIsDeletable(MI_VICE3);
+ SetModelIsDeletable(MI_VICE4);
+ SetModelIsDeletable(MI_VICE5);
+ SetModelIsDeletable(MI_VICE6);
+ SetModelIsDeletable(MI_VICE7);
+ SetModelIsDeletable(MI_VICE8);
+ switch (CCarCtrl::MiamiViceCycle) {
+ case 0:
+ RequestModel(MI_VICE1, STREAMFLAGS_DONT_REMOVE);
+ RequestModel(MI_VICE2, STREAMFLAGS_DONT_REMOVE);
+ break;
+ case 1:
+ RequestModel(MI_VICE3, STREAMFLAGS_DONT_REMOVE);
+ RequestModel(MI_VICE4, STREAMFLAGS_DONT_REMOVE);
+ break;
+ case 2:
+ RequestModel(MI_VICE5, STREAMFLAGS_DONT_REMOVE);
+ RequestModel(MI_VICE6, STREAMFLAGS_DONT_REMOVE);
+ break;
+ case 3:
+ RequestModel(MI_VICE7, STREAMFLAGS_DONT_REMOVE);
+ RequestModel(MI_VICE8, STREAMFLAGS_DONT_REMOVE);
+ break;
+ }
RequestModel(MI_VICECHEE, STREAMFLAGS_DONT_REMOVE);
}
else {
SetModelIsDeletable(MI_VICECHEE);
- //TODO(MIAMI): miami vice peds
+ SetModelIsDeletable(MI_VICE1);
+ SetModelIsDeletable(MI_VICE2);
+ SetModelIsDeletable(MI_VICE3);
+ SetModelIsDeletable(MI_VICE4);
+ SetModelIsDeletable(MI_VICE5);
+ SetModelIsDeletable(MI_VICE6);
+ SetModelIsDeletable(MI_VICE7);
+ SetModelIsDeletable(MI_VICE8);
}
if(timeBeforeNextLoad >= 0)