1 files changed, 17 insertions, 17 deletions

diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index e854da59..985b28c9 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1337,8 +1337,7 @@ CStreaming::LoadInitialPeds(void)
 void
 CStreaming::LoadInitialWeapons(void)
 {
-	// TODO(Miami): Enable when weapons have been ported
-	//CStreaming::RequestModel(MI_NIGHTSTICK, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_NIGHTSTICK, STREAMFLAGS_DONT_REMOVE);
 	CStreaming::RequestModel(MI_MISSILE, STREAMFLAGS_DONT_REMOVE);
 }
 
@@ -1450,7 +1449,8 @@ CStreaming::StreamVehiclesAndPeds(void)
 		timeBeforeNextLoad--;
 	else if(ms_numVehiclesLoaded <= desiredNumVehiclesLoaded){
 		CZoneInfo zone;
-		CTheZones::GetZoneInfoForTimeOfDay(&FindPlayerCoors(), &zone);
+		CVector coors = FindPlayerCoors();
+		CTheZones::GetZoneInfoForTimeOfDay(&coors, &zone);
 		int32 maxReq = -1;
 		int32 mostRequestedRating = 0;
 		for(i = 0; i < CCarCtrl::TOTAL_CUSTOM_CLASSES; i++){
@@ -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;