Merge branch 'miami' of github.com:GTAmodding/re3 into miami

src/core/CdStreamPosix.cpp

@@ -189,10 +189,11 @@ GetGTA3ImgSize(void)
     realpath(gImgNames[0], path);
     if (stat(path, &statbuf) == -1) {
 		// Try case-insensitivity
-		char *r = (char*)alloca(strlen(gImgNames[0]) + 2);
-		if (casepath(gImgNames[0], r))
+		char* real = casepath(gImgNames[0], false);
+		if (real)
 		{
-			realpath(r, path);
+			realpath(real, path);
+			free(real);
     		if (stat(path, &statbuf) != -1)
 				goto ok;
 		}
@@ -210,7 +211,6 @@ CdStreamShutdown(void)
 {
     // Destroying semaphores and free(gpReadInfo) will be done at threads
 #ifndef ONE_THREAD_PER_CHANNEL
-    free(gChannelRequestQ.items);
     gCdStreamThreadStatus = 2;
     sem_post(&gCdStreamSema);
 #endif
@@ -442,6 +442,7 @@ void *CdStreamThread(void *param)
         sem_destroy(&gpReadInfo[i].pDoneSemaphore);
     }
     sem_destroy(&gCdStreamSema);
+	free(gChannelRequestQ.items);
 #else
     sem_destroy(&gpReadInfo[channel].pStartSemaphore);
     sem_destroy(&gpReadInfo[channel].pDoneSemaphore);
@@ -460,10 +461,11 @@ CdStreamAddImage(char const *path)
 
 	// Fix case sensitivity and backslashes.
 	if (gImgFiles[gNumImages] == -1) {
-		char *r = (char*)alloca(strlen(path) + 2);
-		if (casepath(path, r))
+		char* real = casepath(path, false);
+		if (real)
 		{
-		    gImgFiles[gNumImages] = open(r, _gdwCdStreamFlags);
+		    gImgFiles[gNumImages] = open(real, _gdwCdStreamFlags);
+			free(real);
 		}
 	}
 

src/core/FileMgr.cpp

@@ -4,6 +4,7 @@
 #include <direct.h>
 #endif
 #include "common.h"
+#include "crossplatform.h"
 
 #include "FileMgr.h"
 
@@ -31,19 +32,16 @@ static myFILE myfiles[NUMFILES];
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
-#include "crossplatform.h"
 #define _getcwd getcwd
 
 // Case-insensitivity on linux (from https://github.com/OneSadCookie/fcaseopen)
 void mychdir(char const *path)
 {
-    char *r = (char*)alloca(strlen(path) + 2);
-    if (casepath(path, r))
-    {
+	char* r = casepath(path, false);
+    if (r) {
         chdir(r);
-    }
-    else
-    {
+		free(r);
+    } else {
         errno = ENOENT;
     }
 }
@@ -73,30 +71,7 @@ found:
 	*p++ = 'b';
 	*p = '\0';
 	
-#if !defined(_WIN32)
-	char *newPath = strdup(filename);
-	// Normally casepath() fixes backslashes, but if the mode is sth other than r/rb it will create new file with backslashes on linux, so fix backslashes here
-	char *nextBs;
-	while(nextBs = strstr(newPath, "\\")){
-		*nextBs = '/';
-	}
-#else
-	const char *newPath = filename;
-#endif
-
-	myfiles[fd].file = fopen(newPath, realmode);
-// Be case-insensitive on linux (from https://github.com/OneSadCookie/fcaseopen/)
-#if !defined(_WIN32)
-	if (!myfiles[fd].file) {
-		char *r = (char*)alloca(strlen(newPath) + 2);
-		if (casepath(newPath, r))
-		{
-		    myfiles[fd].file = fopen(r, realmode);
-		}
-	}
-
-	free(newPath);
-#endif
+	myfiles[fd].file = fcaseopen(filename, realmode);
 	if(myfiles[fd].file == nil)
 		return 0;
 	return fd;

src/core/Game.cpp

@@ -88,6 +88,7 @@
 #include "Zones.h"
 #include "Occlusion.h"
 #include "debugmenu.h"
+#include "Ropes.h"
 
 eLevelName CGame::currLevel;
 int32 CGame::currArea;
@@ -403,9 +404,11 @@ bool CGame::Initialise(const char* datFile)
 	CRubbish::Init();
 	CClouds::Init();
 	CSpecialFX::Init();
+	CRopes::Init();
 	CWaterCannons::Init();
 	CBridge::Init();
 	CGarages::Init();
+	LoadingScreen("Loading the Game", "Position dynamic objects", nil);
 	LoadingScreen("Loading the Game", "Initialise vehicle paths", nil);
 	CTrain::InitTrains();
 	CPlane::InitPlanes();
@@ -416,6 +419,7 @@ bool CGame::Initialise(const char* datFile)
 	if ( !TheMemoryCard.m_bWantToLoad )
 	{
 #endif
+	LoadingScreen("Loading the Game", "Start script", nil);
 	CTheScripts::StartTestScript();
 	CTheScripts::Process();
 	TheCamera.Process();
@@ -426,6 +430,9 @@ bool CGame::Initialise(const char* datFile)
 	CCollision::ms_collisionInMemory = currLevel;
 	for (int i = 0; i < MAX_PADS; i++)
 		CPad::GetPad(i)->Clear(true);
+	// TODO(Miami)
+	// DMAudio.SetStartingTrackPositions(1);
+	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
 	return true;
 }
 
@@ -546,6 +553,7 @@ void CGame::ReInitGameObjectVariables(void)
 	CRemote::Init();
 #endif
 	CSpecialFX::Init();
+	CRopes::Init();
 	CWaterCannons::Init();
 	CParticle::ReloadConfig();
 
@@ -718,6 +726,7 @@ void CGame::Process(void)
 		CGarages::Update();
 		CRubbish::Update();
 		CSpecialFX::Update();
+		CRopes::Update();
 		CTimeCycle::Update();
 		if (CReplay::ShouldStandardCameraBeProcessed())
 			TheCamera.Process();

src/core/Ropes.cpp

@@ -31,14 +31,14 @@ CRope::Update(void)
 	for(i = 1; i < ARRAY_SIZE(m_pos); i++){
 		CVector prevPos = m_pos[i];
 		m_pos[i] += m_speed[i]*step*CTimer::GetTimeStep();
-		m_pos[0].z -= 0.05f*CTimer::GetTimeStep();
+		m_pos[i].z -= 0.05f*CTimer::GetTimeStep();
 		CVector dist = m_pos[i] - m_pos[i-1];
-		m_pos[i] = m_pos[i-1] + dist/dist.Magnitude()*0.625f;
+		m_pos[i] = m_pos[i-1] + (0.625f/dist.Magnitude())*dist;
 		m_speed[i] = (m_pos[i] - prevPos)/CTimer::GetTimeStep();
 	}
 	if(!m_bWasRegistered && m_pos[0].z < 0.0f)
 		m_bActive = false;
-	m_bWasRegistered = true;
+	m_bWasRegistered = false;
 }
 
 void
@@ -60,7 +60,11 @@ CRope::Render(void)
 	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
 
 	if(RwIm3DTransform(TempBufferRenderVertices, ARRAY_SIZE(m_pos), nil, rwIM3D_VERTEXXYZ|rwIM3D_VERTEXRGBA)){
+#ifdef FIX_BUGS
 		RwIm3DRenderIndexedPrimitive(rwPRIMTYPELINELIST, RopeIndices, 2*(ARRAY_SIZE(m_pos)-1));
+#else
+		RwIm3DRenderIndexedPrimitive(rwPRIMTYPEPOLYLINE, RopeIndices, 2*(ARRAY_SIZE(m_pos)-1));
+#endif
 		RwIm3DEnd();
 	}
 }
@@ -159,7 +163,7 @@ CRopes::CreateRopeWithSwatComingDown(CVector pos)
 
 	if(!CStreaming::HasModelLoaded(MI_SWAT) || !RegisterRope(ropeId+100, pos, true))
 		return false;
-	CCopPed *swat = (CCopPed*)CPopulation::AddPed(PEDTYPE_COP, COP_ARMY, pos);
+	CCopPed *swat = (CCopPed*)CPopulation::AddPed(PEDTYPE_COP, COP_HELI_SWAT, pos);
 	swat->bUsesCollision = false;
 	swat->m_pRopeEntity = (CEntity*)1;
 	swat->m_nRopeID = 100 + ropeId;

src/core/main.cpp

@@ -62,6 +62,7 @@
 #include "SceneEdit.h"
 #include "debugmenu.h"
 #include "Occlusion.h"
+#include "Ropes.h"
 
 GlobalScene Scene;
 
@@ -873,6 +874,7 @@ RenderEffects(void)
 	CGlass::Render();
 	CWaterCannons::Render();
 	CSpecialFX::Render();
+	CRopes::Render();
 	CShadows::RenderStaticShadows();
 	CShadows::RenderStoredShadows();
 	CSkidmarks::Render();