summaryrefslogtreecommitdiffstats
path: root/src/core/Streaming.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-08-24 20:52:16 +0200
committerSergeanur <s.anureev@yandex.ua>2020-08-24 20:52:16 +0200
commitbbcf3fd7d2e699b0fb7e2cceda8e002dfa61ab3f (patch)
tree4d73bdb6237ce683c25354ebae4c3a093cd7f20c /src/core/Streaming.cpp
parentfixes to zones and vehicle comp rules (diff)
downloadre3-bbcf3fd7d2e699b0fb7e2cceda8e002dfa61ab3f.tar
re3-bbcf3fd7d2e699b0fb7e2cceda8e002dfa61ab3f.tar.gz
re3-bbcf3fd7d2e699b0fb7e2cceda8e002dfa61ab3f.tar.bz2
re3-bbcf3fd7d2e699b0fb7e2cceda8e002dfa61ab3f.tar.lz
re3-bbcf3fd7d2e699b0fb7e2cceda8e002dfa61ab3f.tar.xz
re3-bbcf3fd7d2e699b0fb7e2cceda8e002dfa61ab3f.tar.zst
re3-bbcf3fd7d2e699b0fb7e2cceda8e002dfa61ab3f.zip
Diffstat (limited to '')
-rw-r--r--src/core/Streaming.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 74fec192..d296496e 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1668,7 +1668,7 @@ CStreaming::StreamZoneModels(const CVector &pos)
while(ms_bIsPedFromPedGroupLoaded[j]);
ms_bIsPedFromPedGroupLoaded[j] = true;
if(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[j] != -1)
- RequestModel(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i], STREAMFLAGS_DEPENDENCY);
+ RequestModel(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[j], STREAMFLAGS_DEPENDENCY);
}
ms_numPedsLoaded = MAXZONEPEDSLOADED;
timeBeforeNextLoad = 300;
@@ -1692,7 +1692,7 @@ CStreaming::StreamZoneModels(const CVector &pos)
j = CGeneral::GetRandomNumberInRange(0, NUMMODELSPERPEDGROUP);
while(ms_bIsPedFromPedGroupLoaded[j]);
if(ms_numPedsLoaded == MAXZONEPEDSLOADED)
- ms_bIsPedFromPedGroupLoaded[i] = 0;
+ ms_bIsPedFromPedGroupLoaded[i] = false;
ms_bIsPedFromPedGroupLoaded[j] = true;
int newMI = CPopulation::ms_pPedGroups[ms_currentPedGrp].models[j];
if(newMI != oldMI){
@@ -1766,6 +1766,7 @@ CStreaming::RemoveCurrentZonesModels(void)
if (ms_currentPedGrp != -1)
for (i = 0; i < NUMMODELSPERPEDGROUP; i++) {
+ ms_bIsPedFromPedGroupLoaded[i] = false;
if (CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] != -1 &&
CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] != MI_MALE01) {
SetModelIsDeletable(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i]);