Merge branch 'master' into miami

# Conflicts:
#	premake5.lua
#	src/peds/Ped.cpp
#	src/peds/PedIK.cpp
#	src/peds/PedIK.h

premake5.lua

@@ -23,6 +23,22 @@ else
 	Librw = os.getenv("LIBRW") or "librw"
 end
 
+function getsys(a)
+	if a == 'windows' then
+		return 'win'
+	end
+	return a
+end
+
+function getarch(a)
+	if a == 'x86_64' then
+		return 'amd64'
+	elseif a == 'ARM' then
+		return 'arm'
+	end
+	return a
+end
+
 workspace "reVC"
 	language "C++"
 	configurations { "Debug", "Release" }
@@ -40,6 +56,8 @@ workspace "reVC"
 	filter { "system:linux" }
 		platforms {
 			"linux-x86-librw_gl3_glfw-oal",
+			"linux-amd64-librw_gl3_glfw-oal",
+			"linux-arm-librw_gl3_glfw-oal",
 		}
 
 	filter "configurations:Debug"
@@ -58,6 +76,12 @@ workspace "reVC"
 	filter { "platforms:*x86*" }
 		architecture "x86"
 
+	filter { "platforms:*amd64*" }
+		architecture "amd64"
+
+	filter { "platforms:*arm*" }
+		architecture "ARM"
+
 	filter { "platforms:*librw_d3d9*" }
 		defines { "RW_D3D9" }
 		if(not _OPTIONS["with-librw"]) then
@@ -68,17 +92,12 @@ workspace "reVC"
 		defines { "RW_GL3" }
 		includedirs { path.join(_OPTIONS["glfwdir"], "include") }
 		includedirs { path.join(_OPTIONS["glewdir"], "include") }
-
-	filter "platforms:win*librw_gl3_glfw*"
-		defines { "GLEW_STATIC" }
 		if(not _OPTIONS["with-librw"]) then
-			libdirs { path.join(Librw, "lib/win-x86-gl3/%{cfg.buildcfg}") }
+			libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
 		end
 
-	filter "platforms:linux*librw_gl3_glfw*"
-		if(not _OPTIONS["with-librw"]) then
-			libdirs { path.join(Librw, "lib/linux-x86-gl3/%{cfg.buildcfg}") }
-		end
+	filter "platforms:win*librw_gl3_glfw*"
+		defines { "GLEW_STATIC" }
 
 	filter  {}
 
@@ -182,7 +201,6 @@ project "reVC"
 		targetextension ".exe"
 
 	filter "platforms:linux*"
-		targetextension ".elf"
 		defines { "OPENAL" }
 		links { "openal", "mpg123", "sndfile", "pthread" }
 

src/audio/AudioManager.cpp

@@ -7459,7 +7459,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 			return;
 		}
 		if (processedAccelSampleStopped) {
-			if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + 345, 0))
+			if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + SFX_CAR_ACCEL_1, 0))
 				return;
 			SampleManager.SetChannelLoopCount(m_nActiveSamples, 1);
 			SampleManager.SetChannelLoopPoints(m_nActiveSamples, 0, -1);
@@ -7482,7 +7482,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 		}
 		if (CurrentPretendGear < params->m_pTransmission->nNumberOfGears - 1) {
 			++CurrentPretendGear;
-			if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + 345, 0))
+			if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + SFX_CAR_ACCEL_1, 0))
 				return;
 			SampleManager.SetChannelLoopCount(m_nActiveSamples, 1);
 			SampleManager.SetChannelLoopPoints(m_nActiveSamples, 0, -1);

src/fakerw/fake.cpp

@@ -470,7 +470,7 @@ RwBool RwRenderStateSet(RwRenderState state, void *value)
 	uint32 uival = (uintptr)value;
 	uint32 fog;
 	switch(state){
-	case rwRENDERSTATETEXTURERASTER: SetRenderState(TEXTURERASTER, uival); return true;
+	case rwRENDERSTATETEXTURERASTER: SetRenderStatePtr(TEXTURERASTER, value); return true;
 	case rwRENDERSTATETEXTUREADDRESS: SetRenderState(TEXTUREADDRESS, uival); return true;
 	case rwRENDERSTATETEXTUREADDRESSU: SetRenderState(TEXTUREADDRESSU, uival); return true;
 	case rwRENDERSTATETEXTUREADDRESSV: SetRenderState(TEXTUREADDRESSV, uival); return true;

src/rw/RwHelper.cpp

@@ -60,13 +60,24 @@ void FlushObrsPrintfs()
 void *
 RwMallocAlign(RwUInt32 size, RwUInt32 align)
 {
+#ifdef FIX_BUGS
+	uintptr ptralign = align-1;
+	void *mem = (void *)malloc(size + sizeof(uintptr) + ptralign);
+
+	ASSERT(mem != nil);
+
+	void *addr = (void *)((((uintptr)mem) + sizeof(uintptr) + ptralign) & ~ptralign);
+
+	ASSERT(addr != nil);
+#else
 	void *mem = (void *)malloc(size + align);
 
 	ASSERT(mem != nil);
 
 	void *addr = (void *)((((uintptr)mem) + align) & ~(align - 1));
 
 	ASSERT(addr != nil);
+#endif
 
 	*(((void **)addr) - 1) = mem;