2 files changed, 8 insertions, 7 deletions

diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 0ce8b50e..985b28c9 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1449,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++){
diff --git a/src/core/Zones.cpp b/src/core/Zones.cpp
index 0e8606f3..84b5ca29 100644
--- a/src/core/Zones.cpp
+++ b/src/core/Zones.cpp
@@ -725,17 +725,17 @@ CTheZones::LoadAllZones(uint8 *buffer, uint32 size)
 	for(i = 0; i < ARRAY_SIZE(NavigationZoneArray); i++){
 		NavigationZoneArray[i] = ReadSaveBuf<CZone>(buffer);
 
-		NavigationZoneArray[i].child = GetPointerForZoneIndex((int32)NavigationZoneArray[i].child);
-		NavigationZoneArray[i].parent = GetPointerForZoneIndex((int32)NavigationZoneArray[i].parent);
-		NavigationZoneArray[i].next = GetPointerForZoneIndex((int32)NavigationZoneArray[i].next);
+		NavigationZoneArray[i].child = GetPointerForZoneIndex((uintptr)NavigationZoneArray[i].child);
+		NavigationZoneArray[i].parent = GetPointerForZoneIndex((uintptr)NavigationZoneArray[i].parent);
+		NavigationZoneArray[i].next = GetPointerForZoneIndex((uintptr)NavigationZoneArray[i].next);
 	}
 
 	for(i = 0; i < ARRAY_SIZE(InfoZoneArray); i++){
 		InfoZoneArray[i] = ReadSaveBuf<CZone>(buffer);
 
-		InfoZoneArray[i].child = GetPointerForZoneIndex((int32)InfoZoneArray[i].child);
-		InfoZoneArray[i].parent = GetPointerForZoneIndex((int32)InfoZoneArray[i].parent);
-		InfoZoneArray[i].next = GetPointerForZoneIndex((int32)InfoZoneArray[i].next);
+		InfoZoneArray[i].child = GetPointerForZoneIndex((uintptr)InfoZoneArray[i].child);
+		InfoZoneArray[i].parent = GetPointerForZoneIndex((uintptr)InfoZoneArray[i].parent);
+		InfoZoneArray[i].next = GetPointerForZoneIndex((uintptr)InfoZoneArray[i].next);
 	}
 
 	for(i = 0; i < ARRAY_SIZE(ZoneInfoArray); i++)