Fixed CloneRemoverExcludeModels

ViperJohnGR · ViperJohnGR · commit 567030331ab1 · 2022-01-26T17:36:05.000+02:00
diff --git a/ModelVariations/ModelVariations.cpp b/ModelVariations/ModelVariations.cpp
@@ -656,14 +656,13 @@ class ModelVariations {
                         }
                     }
 
-                    if (!pedRemoved)
+                    if (!pedRemoved && !IdExists(cloneRemoverExclusions, ped->m_nModelIndex) && ped->m_nModelIndex > 0)
                     {
                         pedTimeSinceLastSpawned.insert({ ((cloneRemoverIncludeVariations == 1) ? getVariationOriginalModel(ped->m_nModelIndex) : ped->m_nModelIndex), clock() });
                         for (CPed* ped2 : CPools::ms_pPedPool)
                             if (ped2 != NULL  &&  ped2 != ped  &&  ((cloneRemoverIncludeVariations == 1) ?
                                                                     (getVariationOriginalModel(ped->m_nModelIndex) == getVariationOriginalModel(ped2->m_nModelIndex)) :
-                                                                    (ped->m_nModelIndex == ped2->m_nModelIndex)) &&
-                                ped->m_nModelIndex == ped2->m_nModelIndex  &&  ped2->m_nModelIndex > 0  &&  !IdExists(cloneRemoverExclusions, ped2->m_nModelIndex))
+                                                                    (ped->m_nModelIndex == ped2->m_nModelIndex)) &&  ped->m_nModelIndex == ped2->m_nModelIndex)
                             {
                                 if (ped->m_pVehicle != NULL && cloneRemoverVehicleOccupants == 1)
                                 {

Original file line number	Diff line number	Diff line change
`@@ -656,14 +656,13 @@ class ModelVariations {`
`656`	`656`	`}`
`657`	`657`	`}`
`658`	`658`
`659`		`- if (!pedRemoved)`
	`659`	`+ if (!pedRemoved && !IdExists(cloneRemoverExclusions, ped->m_nModelIndex) && ped->m_nModelIndex > 0)`
`660`	`660`	`{`
`661`	`661`	`pedTimeSinceLastSpawned.insert({ ((cloneRemoverIncludeVariations == 1) ? getVariationOriginalModel(ped->m_nModelIndex) : ped->m_nModelIndex), clock() });`
`662`	`662`	`for (CPed* ped2 : CPools::ms_pPedPool)`
`663`	`663`	`if (ped2 != NULL && ped2 != ped && ((cloneRemoverIncludeVariations == 1) ?`
`664`	`664`	`(getVariationOriginalModel(ped->m_nModelIndex) == getVariationOriginalModel(ped2->m_nModelIndex)) :`
`665`		`- (ped->m_nModelIndex == ped2->m_nModelIndex)) &&`
`666`		`- ped->m_nModelIndex == ped2->m_nModelIndex && ped2->m_nModelIndex > 0 && !IdExists(cloneRemoverExclusions, ped2->m_nModelIndex))`
	`665`	`+ (ped->m_nModelIndex == ped2->m_nModelIndex)) && ped->m_nModelIndex == ped2->m_nModelIndex)`
`667`	`666`	`{`
`668`	`667`	`if (ped->m_pVehicle != NULL && cloneRemoverVehicleOccupants == 1)`
`669`	`668`	`{`