3 files changed, 48 insertions, 27 deletions

diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 5a2def05..76ee47b0 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -2578,7 +2578,7 @@ void CCarCtrl::SwitchVehicleToRealPhysics(CVehicle* pVehicle)
 void CCarCtrl::JoinCarWithRoadSystem(CVehicle* pVehicle)
 {
 	pVehicle->AutoPilot.m_nPrevRouteNode = pVehicle->AutoPilot.m_nCurrentRouteNode = pVehicle->AutoPilot.m_nNextRouteNode = 0;
-	pVehicle->AutoPilot.m_nCurrentRouteNode = pVehicle->AutoPilot.m_nPreviousPathNodeInfo = pVehicle->AutoPilot.m_nNextPathNodeInfo = 0;
+	pVehicle->AutoPilot.m_nCurrentPathNodeInfo = pVehicle->AutoPilot.m_nPreviousPathNodeInfo = pVehicle->AutoPilot.m_nNextPathNodeInfo = 0;
 	int nodeId = ThePaths.FindNodeClosestToCoorsFavourDirection(pVehicle->GetPosition(), 0, pVehicle->GetForward().x, pVehicle->GetForward().y);
 	CPathNode* pNode = &ThePaths.m_pathNodes[nodeId];
 	int prevNodeId = -1;
diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp
index e114a29a..40000f03 100644
--- a/src/core/CdStreamPosix.cpp
+++ b/src/core/CdStreamPosix.cpp
@@ -36,9 +36,9 @@ struct CdReadInfo
 #ifdef ONE_THREAD_PER_CHANNEL
 	int8 nThreadStatus; // 0: created 1:initalized 2:abort now
     pthread_t pChannelThread;
-    sem_t pStartSemaphore;
+    sem_t *pStartSemaphore;
 #endif
-	sem_t pDoneSemaphore; // used for CdStreamSync
+	sem_t *pDoneSemaphore; // used for CdStreamSync
 	int32 hFile;
 };
 
@@ -51,7 +51,7 @@ char *gImgNames[MAX_CDIMAGES];
 
 #ifndef ONE_THREAD_PER_CHANNEL
 pthread_t _gCdStreamThread;
-sem_t gCdStreamSema; // released when we have new thing to read(so channel is set)
+sem_t *gCdStreamSema; // released when we have new thing to read(so channel is set)
 int8 gCdStreamThreadStatus; // 0: created 1:initalized 2:abort now
 Queue gChannelRequestQ;
 bool _gbCdStreamOverlapped;
@@ -76,11 +76,11 @@ CdStreamInitThread(void)
 	gChannelRequestQ.tail = 0;
 	gChannelRequestQ.size = gNumChannels + 1;
 	ASSERT(gChannelRequestQ.items != nil );
-    status = sem_init(&gCdStreamSema, 0, 0);
+  gCdStreamSema = sem_open("/semaphore_cd_stream", O_CREAT, 0644, 1);
 #endif
 
 
-	if (status == -1) {
+	if (gCdStreamSema == SEM_FAILED) {
 		CDTRACE("failed to create stream semaphore");
 		ASSERT(0);
 		return;
@@ -91,18 +91,18 @@ CdStreamInitThread(void)
 	{
 		for ( int32 i = 0; i < gNumChannels; i++ )
 		{
-		    status = sem_init(&gpReadInfo[i].pDoneSemaphore, 0, 0);
+      gpReadInfo[i].pDoneSemaphore = sem_open("/semaphore_done", O_CREAT, 0644, 1);
 
-			if (status == -1)
+      if (gpReadInfo[i].pDoneSemaphore == SEM_FAILED)
 			{
 				CDTRACE("failed to create sync semaphore");
 				ASSERT(0);
 				return;
 			}
 #ifdef ONE_THREAD_PER_CHANNEL
-		    status = sem_init(&gpReadInfo[i].pStartSemaphore, 0, 0);
+      gpReadInfo[i].pStartSemaphore = sem_open("/semaphore_start", O_CREAT, 0644, 1);
 
-			if (status == -1)
+      if (gpReadInfo[i].pStartSemaphore == SEM_FAILED)
 			{
 				CDTRACE("failed to create start semaphore");
 				ASSERT(0);
@@ -135,7 +135,7 @@ CdStreamInitThread(void)
         return;
     }
 #else
-    debug("Using seperate streaming threads for each channel\n");
+    debug("Using separate streaming threads for each channel\n");
 #endif
 }
 
@@ -163,7 +163,7 @@ CdStreamInit(int32 numChannels)
 		debug("Using no buffered loading for streaming\n");
 	}
 */
-	void *pBuffer = (void *)RwMallocAlign(CDSTREAM_SECTOR_SIZE, fsInfo.f_bsize);
+	void *pBuffer = (void *)RwMallocAlign(CDSTREAM_SECTOR_SIZE, (RwUInt32)fsInfo.f_bsize);
 	ASSERT( pBuffer != nil );
 
 	gNumImages = 0;
@@ -205,7 +205,7 @@ GetGTA3ImgSize(void)
         return 0;
     }
 ok:
-	return statbuf.st_size;
+	return (uint32)statbuf.st_size;
 }
 
 void
@@ -214,7 +214,7 @@ CdStreamShutdown(void)
     // Destroying semaphores and free(gpReadInfo) will be done at threads
 #ifndef ONE_THREAD_PER_CHANNEL
     gCdStreamThreadStatus = 2;
-    sem_post(&gCdStreamSema);
+    sem_post(gCdStreamSema);
 #endif
 
 #ifdef ONE_THREAD_PER_CHANNEL
@@ -254,7 +254,7 @@ CdStreamRead(int32 channel, void *buffer, uint32 offset, uint32 size)
 
 #ifndef ONE_THREAD_PER_CHANNEL
     AddToQueue(&gChannelRequestQ, channel);
-    if ( sem_post(&gCdStreamSema) != 0 )
+    if ( sem_post(gCdStreamSema) != 0 )
         printf("Signal Sema Error\n");
 #else
     if ( sem_post(&gpReadInfo[channel].pStartSemaphore) != 0 )
@@ -332,7 +332,7 @@ CdStreamSync(int32 channel)
     {
         pChannel->bLocked = true;
 
-        sem_wait(&pChannel->pDoneSemaphore);
+        sem_wait(pChannel->pDoneSemaphore);
     }
 
     pChannel->bReading = false;
@@ -383,7 +383,7 @@ void *CdStreamThread(void *param)
 
 #ifndef ONE_THREAD_PER_CHANNEL
     while (gCdStreamThreadStatus != 2) {
-		sem_wait(&gCdStreamSema);
+		sem_wait(gCdStreamSema);
         int32 channel = GetFirstInQueue(&gChannelRequestQ);
 #else
     int channel = *((int*)param);
@@ -437,20 +437,24 @@ void *CdStreamThread(void *param)
 
 		if ( pChannel->bLocked )
 		{
-			sem_post(&pChannel->pDoneSemaphore);
+			sem_post(pChannel->pDoneSemaphore);
 		}
 		pChannel->bReading = false;
 	}
 #ifndef ONE_THREAD_PER_CHANNEL
     for ( int32 i = 0; i < gNumChannels; i++ )
     {
-        sem_destroy(&gpReadInfo[i].pDoneSemaphore);
+      sem_close(gpReadInfo[i].pDoneSemaphore);
+      sem_unlink("/semaphore_done");
     }
-    sem_destroy(&gCdStreamSema);
-	free(gChannelRequestQ.items);
+    sem_close(gCdStreamSema);
+    sem_unlink("/semaphore_cd_stream");
+    free(gChannelRequestQ.items);
 #else
-    sem_destroy(&gpReadInfo[channel].pStartSemaphore);
-    sem_destroy(&gpReadInfo[channel].pDoneSemaphore);
+  sem_close(gpReadInfo[channel].pStartSemaphore);
+  sem_unlink("/semaphore_start");
+  sem_close(gpReadInfo[channel].pDoneSemaphore);
+  sem_unlink("/semaphore_done");
 #endif
     free(gpReadInfo);
 	pthread_exit(nil);
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index cd8380b2..4dd9570e 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -80,7 +80,12 @@ DWORD _dwOperatingSystemVersion;
 #include "resource.h"
 #else
 long _dwOperatingSystemVersion;
+#ifndef __APPLE__
 #include <sys/sysinfo.h>
+#else
+#include <mach/mach_host.h>
+#include <sys/sysctl.h>
+#endif
 #include <stddef.h>
 #include <locale.h>
 #include <signal.h>
@@ -446,16 +451,28 @@ psInitialize(void)
 
 	debug("Physical memory size %u\n", memstats.dwTotalPhys);
 	debug("Available physical memory %u\n", memstats.dwAvailPhys);
+#elif defined (__APPLE__)
+	uint64_t size = 0;
+	uint64_t page_size = 0;
+	size_t uint64_len = sizeof(uint64_t);
+	size_t ull_len = sizeof(unsigned long long);
+	sysctl((int[]){CTL_HW, HW_PAGESIZE}, 2, &page_size, &ull_len, NULL, 0);
+	sysctl((int[]){CTL_HW, HW_MEMSIZE}, 2, &size, &uint64_len, NULL, 0);
+	vm_statistics_data_t vm_stat;
+	mach_msg_type_number_t count = HOST_VM_INFO_COUNT;
+	host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)&vm_stat, &count);
+	_dwMemAvailPhys = (uint64_t)(vm_stat.free_count * page_size);
+	debug("Physical memory size %llu\n", _dwMemAvailPhys);
+	debug("Available physical memory %llu\n", size);
 #else
-	struct sysinfo systemInfo;
+ 	struct sysinfo systemInfo;
 	sysinfo(&systemInfo);
-	
 	_dwMemAvailPhys = systemInfo.freeram;
 	debug("Physical memory size %u\n", systemInfo.totalram);
 	debug("Available physical memory %u\n", systemInfo.freeram);
-
 #endif
-	TheText.Unload();
+  
+  TheText.Unload();
 
 	return TRUE;
 }