diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 16:00:40 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 16:00:40 +0200 |
| commit | e3291b0cb14811d9201a5f66f0e8633612ecef7e (patch) | |
| tree | c90f89b280e9077e2020db8d99ac24265762fad0 /src/core | |
| parent | Weapon fixes (diff) | |
| download | re3-e3291b0cb14811d9201a5f66f0e8633612ecef7e.tar re3-e3291b0cb14811d9201a5f66f0e8633612ecef7e.tar.gz re3-e3291b0cb14811d9201a5f66f0e8633612ecef7e.tar.bz2 re3-e3291b0cb14811d9201a5f66f0e8633612ecef7e.tar.lz re3-e3291b0cb14811d9201a5f66f0e8633612ecef7e.tar.xz re3-e3291b0cb14811d9201a5f66f0e8633612ecef7e.tar.zst re3-e3291b0cb14811d9201a5f66f0e8633612ecef7e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/Streaming.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index e854da59..09d5cc72 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -1524,26 +1524,26 @@ CStreaming::StreamZoneModels(const CVector &pos) bit = 1<<i; if(gangsToLoad & bit && (ms_loadedGangs & bit) == 0){ - RequestModel(MI_GANG01 + i*2, STREAMFLAGS_DEPENDENCY); - RequestModel(MI_GANG01 + i*2 + 1, STREAMFLAGS_DEPENDENCY); + RequestModel(CGangs::GetGangPedModel1(i), STREAMFLAGS_DEPENDENCY); + RequestModel(CGangs::GetGangPedModel2(i), STREAMFLAGS_DEPENDENCY); ms_loadedGangs |= bit; }else if((gangsToLoad & bit) == 0 && ms_loadedGangs & bit){ - SetModelIsDeletable(MI_GANG01 + i*2); - SetModelIsDeletable(MI_GANG01 + i*2 + 1); - SetModelTxdIsDeletable(MI_GANG01 + i*2); - SetModelTxdIsDeletable(MI_GANG01 + i*2 + 1); + SetModelIsDeletable(CGangs::GetGangPedModel1(i)); + SetModelIsDeletable(CGangs::GetGangPedModel2(i)); + SetModelTxdIsDeletable(CGangs::GetGangPedModel1(i)); + SetModelTxdIsDeletable(CGangs::GetGangPedModel2(i)); ms_loadedGangs &= ~bit; } // TODO(MIAMI): check this - if(CGangs::GetGangInfo(i)->m_nVehicleMI < 0) + if(CGangs::GetGangVehicleModel(i) < 0) continue; if((gangCarsToLoad & bit) && (ms_loadedGangCars & bit) == 0){ - RequestModel(CGangs::GetGangInfo(i)->m_nVehicleMI, STREAMFLAGS_DEPENDENCY); + RequestModel(CGangs::GetGangVehicleModel(i), STREAMFLAGS_DEPENDENCY); }else if((gangCarsToLoad & bit) == 0 && ms_loadedGangCars & bit){ - SetModelIsDeletable(CGangs::GetGangInfo(i)->m_nVehicleMI); - SetModelTxdIsDeletable(CGangs::GetGangInfo(i)->m_nVehicleMI); + SetModelIsDeletable(CGangs::GetGangVehicleModel(i)); + SetModelTxdIsDeletable(CGangs::GetGangVehicleModel(i)); } } ms_loadedGangCars = gangCarsToLoad; @@ -1563,10 +1563,10 @@ CStreaming::RemoveCurrentZonesModels(void) } for(i = 0; i < NUM_GANGS; i++){ - SetModelIsDeletable(MI_GANG01 + i*2); - SetModelIsDeletable(MI_GANG01 + i*2 + 1); - if(CGangs::GetGangInfo(i)->m_nVehicleMI != -1) - SetModelIsDeletable(CGangs::GetGangInfo(i)->m_nVehicleMI); + SetModelIsDeletable(CGangs::GetGangPedModel1(i)); + SetModelIsDeletable(CGangs::GetGangPedModel2(i)); + if(CGangs::GetGangVehicleModel(i) != -1) + SetModelIsDeletable(CGangs::GetGangVehicleModel(i)); } ms_currentPedGrp = -1; |