Merge branch 'master' into miami

# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h

eax/eax.h

@@ -12,7 +12,7 @@
 extern "C" {
 #endif // __cplusplus
 
-#ifndef OPENAL
+#ifndef AUDIO_OAL
 	#include <dsound.h>
 
 	/*
@@ -49,13 +49,9 @@ extern "C" {
     typedef void (CDECL *LPGETCURRENTVERSION)(LPDWORD major, LPDWORD minor);
 
 
-#else // OPENAL
-#ifndef _WIN32
+#else // AUDIO_OAL
 	#include <AL/al.h>
 	#include <string.h>
-#else
-	#include <al.h>
-#endif
 
 	#ifndef GUID_DEFINED
 		#define GUID_DEFINED

premake5.lua

@@ -51,6 +51,9 @@ workspace "reVC"
 			"win-x86-RW33_d3d8-mss",
 			"win-x86-librw_d3d9-mss",
 			"win-x86-librw_gl3_glfw-mss",
+			"win-x86-RW33_d3d8-oal",
+			"win-x86-librw_d3d9-oal",
+			"win-x86-librw_gl3_glfw-oal",
 		}
 
 	filter { "system:linux" }
@@ -184,11 +187,17 @@ project "reVC"
 	includedirs { "src/extras" }
 	includedirs { "eax" }
 
-	includedirs { "milessdk/include" }
 	includedirs { "eax" }
-
-	libdirs { "milessdk/lib" }
 	
+	filter "platforms:*mss"
+		defines { "AUDIO_MSS" }
+		includedirs { "milessdk/include" }
+		libdirs { "milessdk/lib" }
+		
+	filter "platforms:*oal"
+		defines { "AUDIO_OAL" }
+
+	filter {}
 	if(os.getenv("GTA_VC_RE_DIR")) then
 		setpaths("$(GTA_VC_RE_DIR)/", "%(cfg.buildtarget.name)", "")
 	end
@@ -200,8 +209,15 @@ project "reVC"
 		characterset ("MBCS")
 		targetextension ".exe"
 
-	filter "platforms:linux*"
-		defines { "OPENAL" }
+	filter "platforms:win*oal"
+		includedirs { "openal-soft/include" }
+		includedirs { "libsndfile/include" }
+		includedirs { "mpg123/include" }
+		libdirs { "openal-soft/libs/Win32" }
+		libdirs { "libsndfile/lib" }
+		libdirs { "mpg123/lib" }
+
+	filter "platforms:linux*oal"
 		links { "openal", "mpg123", "sndfile", "pthread" }
 
 	filter "platforms:*RW33*"

src/audio/oal/channel.cpp

@@ -1,7 +1,7 @@
-#include "channel.h"
+#include "common.h"
 
 #ifdef AUDIO_OAL
-#include "common.h"
+#include "channel.h"
 #include "sampman.h"
 
 #ifndef _WIN32

src/audio/oal/channel.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "common.h"
 
 #ifdef AUDIO_OAL
 #include "oal/oal_utils.h"

src/audio/oal/oal_utils.cpp

@@ -1,3 +1,4 @@
+#include "common.h"
 #include "oal_utils.h"
 
 #ifdef AUDIO_OAL

src/audio/oal/oal_utils.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "common.h"
 
 #ifdef AUDIO_OAL
 #include "eax.h"

src/audio/oal/stream.cpp

@@ -1,11 +1,9 @@
-#include "stream.h"
+#include "common.h"
 
 #ifdef AUDIO_OAL
-#include "common.h"
+#include "stream.h"
 #include "sampman.h"
 
-#include <sndfile.h>
-#include <mpg123.h>
 #ifdef _WIN32
 typedef long ssize_t;
 #pragma comment( lib, "libsndfile-1.lib" )
@@ -13,6 +11,8 @@ typedef long ssize_t;
 #else
 #include "crossplatform.h"
 #endif
+#include <sndfile.h>
+#include <mpg123.h>
 
 class CSndFile : public IDecoder
 {

src/audio/oal/stream.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "common.h"
 
 #ifdef AUDIO_OAL
 #include <AL/al.h>

src/audio/sampman_miles.cpp

@@ -1445,7 +1445,7 @@ cSampleManager::IsSampleBankLoaded(uint8 nBank)
 bool
 cSampleManager::IsPedCommentLoaded(uint32 nComment)
 {
-	uint8 slot;
+	int8 slot;
 
 	for ( int32 i = 0; i < _TODOCONST(3); i++ )
 	{
@@ -1464,7 +1464,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
 int32
 cSampleManager::_GetPedCommentSlot(uint32 nComment)
 {
-	uint8 slot;
+	int8 slot;
 
 	for ( int32 i = 0; i < _TODOCONST(3); i++ )
 	{

src/audio/sampman_oal.cpp

@@ -775,7 +775,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
 {
 	ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
 	
-	uint8 slot;
+	int8 slot;
 
 	for ( int32 i = 0; i < _TODOCONST(3); i++ )
 	{
@@ -795,7 +795,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
 int32
 cSampleManager::_GetPedCommentSlot(uint32 nComment)
 {
-	uint8 slot;
+	int8 slot;
 
 	for (int32 i = 0; i < _TODOCONST(3); i++)
 	{

src/core/Timer.h

@@ -58,7 +58,7 @@ public:
 	friend bool GenericSave(int file);
 
 #ifdef FIX_BUGS
-	static float GetDefaultTimeStep(void) { return 5.0f / 3.0f; }
+	static float GetDefaultTimeStep(void) { return 50.0f / 30.0f; }
 	static float GetTimeStepFix(void) { return GetTimeStep() / GetDefaultTimeStep(); }
 #endif
 };

src/core/config.h

@@ -199,11 +199,6 @@ enum Config {
 #define USE_TXD_CDIMAGE		// generate and load textures from txd.img
 #define IMPROVED_VIDEOMODE	// save and load videomode parameters instead of a magic number
 //#define USE_TEXTURE_POOL
-#ifdef _WIN32
-#define AUDIO_MSS
-#else
-#define AUDIO_OAL
-#endif
 #ifdef DEBUGMENU
 #define RELOADABLES			// some debug menu options to reload TXD files
 #endif

src/skel/skeleton.h

@@ -241,19 +241,19 @@ extern RsEventStatus RsEventHandler(RsEvent event, void *param);
 extern RsEventStatus RsKeyboardEventHandler(RsEvent event, void *param);
 extern RsEventStatus RsPadEventHandler(RsEvent event, void *param);
 
-extern RwBool                   
+extern RwBool
 RsInitialize(void);
 
-extern RwBool                   
+extern RwBool
 RsRegisterImageLoader(void);
 
-extern RwBool                   
+extern RwBool
 RsRwInitialize(void *param);
 
-extern RwBool                   
+extern RwBool
 RsSelectDevice(void);
 
-extern RwBool                   
+extern RwBool
 RsInputDeviceAttach(RsInputDeviceType inputDevice,
 					RsInputEventHandler inputEventHandler);
 

src/vehicles/Cranes.cpp

@@ -187,7 +187,7 @@ bool CCranes::IsThisCarPickedUp(float X, float Y, CVehicle* pVehicle)
 				result = true;
 		}
 	}
-	return true;
+	return result;
 }
 
 void CCranes::UpdateCranes(void)