Merge branch 'master' into opus

# Conflicts:
#	eax/eax.h
#	premake5.lua
#	src/audio/oal/stream.cpp

eax/eax.h

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

premake5.lua

@@ -56,6 +56,9 @@ workspace "re3"
 			"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" }
@@ -188,12 +191,8 @@ project "re3"
 	includedirs { "src/extras" }
 	includedirs { "eax" }
 
-	includedirs { "milessdk/include" }
 	includedirs { "eax" }
 	
-	includedirs { "openal-soft/include" }
-	includedirs { "mpg123/include" }
-	includedirs { "libsndfile/include" }
 	if _OPTIONS["with-opus"] then
 		includedirs { "ogg/include" }
 		includedirs { "opus/include" }
@@ -212,6 +211,10 @@ project "re3"
 		filter {}
 	end
 		
+	filter "platforms:*oal"
+		defines { "AUDIO_OAL" }
+	
+	filter {}
 	if(os.getenv("GTA_III_RE_DIR")) then
 		setpaths("$(GTA_III_RE_DIR)/", "%(cfg.buildtarget.name)", "")
 	end
@@ -223,8 +226,15 @@ project "re3"
 		characterset ("MBCS")
 		targetextension ".exe"
 
-	filter "platforms:linux*"
+	filter "platforms:win*oal"
-		defines { "OPENAL" }
+		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" }
 	
 	if _OPTIONS["with-opus"] then

src/audio/AudioManager.cpp

@@ -39,8 +39,8 @@ cAudioManager::cAudioManager()
 	}
 	m_nAudioEntitiesTotal = 0;
 	m_FrameCounter = 0;
-	m_bFifthFrameFlag = 0;
+	m_bFifthFrameFlag = false;
-	m_bTimerJustReset = 0;
+	m_bTimerJustReset = false;
 	m_nTimer = 0;
 }
 

src/audio/AudioManager.h

@@ -328,7 +328,7 @@ public:
 	float GetCollisionRatio(float a, float b, float c, float d) const;
 	float GetDistanceSquared(const CVector &v) const;
 	int32 GetJumboTaxiFreq() const;
-	bool GetMissionAudioLoadingStatus() const;
+	uint8 GetMissionAudioLoadingStatus() const;
 	int8 GetMissionScriptPoliceAudioPlayingStatus() const;
 	uint8 GetNum3DProvidersAvailable() const;
 	int32 GetPedCommentSfx(CPed *ped, int32 sound);

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,7 +1,7 @@
-#include "stream.h"
+#include "common.h"
 
 #ifdef AUDIO_OAL
-#include "common.h"
+#include "stream.h"
 #include "sampman.h"
 
 #ifdef AUDIO_OPUS

src/audio/oal/stream.h

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

src/control/Script.cpp

@@ -4333,7 +4333,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 	}
 	case COMMAND_SET_CAR_HEAVY:
 	{
-		CollectParameters(&m_nIp, 1);
+		CollectParameters(&m_nIp, 2);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
 		pVehicle->bIsHeavy = (ScriptParams[1] != 0);

src/core/config.h

@@ -196,11 +196,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
 
 // Particle
 //#define PC_PARTICLE

src/core/main.cpp

@@ -328,7 +328,7 @@ PluginAttach(void)
 static RwBool 
 Initialise3D(void *param)
 {
-	if (RsRwInitialise(param))
+	if (RsRwInitialize(param))
 	{
 #ifdef DEBUGMENU
 		DebugMenuInit();
@@ -1146,10 +1146,10 @@ AppEventHandler(RsEvent event, void *param)
 {
 	switch( event )
 	{
-		case rsINITIALISE:
+		case rsINITIALIZE:
 		{
 			CGame::InitialiseOnceBeforeRW();
-			return RsInitialise() ? rsEVENTPROCESSED : rsEVENTERROR;
+			return RsInitialize() ? rsEVENTPROCESSED : rsEVENTERROR;
 		}
 
 		case rsCAMERASIZE:
@@ -1161,7 +1161,7 @@ AppEventHandler(RsEvent event, void *param)
 			return rsEVENTPROCESSED;
 		}
 
-		case rsRWINITIALISE:
+		case rsRWINITIALIZE:
 		{
 			return Initialise3D(param) ? rsEVENTPROCESSED : rsEVENTERROR;
 		}

src/skel/glfw/glfw.cpp

@@ -274,7 +274,7 @@ psNativeTextureSupport(void)
  *****************************************************************************
  */
 RwBool
-psInitialise(void)
+psInitialize(void)
 {
 	PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
 
@@ -789,7 +789,7 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
 	
 	useDefault = TRUE;
 	
-	if ( RsEventHandler(rsRWINITIALISE, &openParams) == rsEVENTERROR )
+	if ( RsEventHandler(rsRWINITIALIZE, &openParams) == rsEVENTERROR )
 		return FALSE;
 
 	RwInitialised = TRUE;
@@ -1312,7 +1312,7 @@ main(int argc, char *argv[])
 	 * Initialize the platform independent data.
 	 * This will in turn initialize the platform specific data...
 	 */
-	if( RsEventHandler(rsINITIALISE, nil) == rsEVENTERROR )
+	if( RsEventHandler(rsINITIALIZE, nil) == rsEVENTERROR )
 	{
 		return FALSE;
 	}
@@ -1355,7 +1355,7 @@ main(int argc, char *argv[])
 	/* 
 	 * Initialize the 3D (RenderWare) components of the app...
 	 */
-	if( rsEVENTERROR == RsEventHandler(rsRWINITIALISE, &openParams) )
+	if( rsEVENTERROR == RsEventHandler(rsRWINITIALIZE, &openParams) )
 	{
 		RsEventHandler(rsTERMINATE, nil);
 

src/skel/platform.h

@@ -15,7 +15,7 @@ extern RwUInt32 psTimer(void);
 extern double psTimer(void);
 #endif
 
-extern RwBool psInitialise(void);
+extern RwBool psInitialize(void);
 extern void   psTerminate(void);
 
 extern void psCameraShowRaster(RwCamera *camera);

src/skel/skeleton.cpp

@@ -246,8 +246,8 @@ RsEventHandler(RsEvent event, void *param)
 				result = (rsEVENTPROCESSED);
 				break;
 
-			case rsRWINITIALISE:
+			case rsRWINITIALIZE:
-				result = (RsRwInitialise(param) ?
+				result = (RsRwInitialize(param) ?
 						  rsEVENTPROCESSED : rsEVENTERROR);
 				break;
 
@@ -256,9 +256,9 @@ RsEventHandler(RsEvent event, void *param)
 				result = (rsEVENTPROCESSED);
 				break;
 
-			case rsINITIALISE:
+			case rsINITIALIZE:
 				result =
-					(RsInitialise()? rsEVENTPROCESSED : rsEVENTERROR);
+					(RsInitialize()? rsEVENTPROCESSED : rsEVENTERROR);
 				break;
 
 			default:
@@ -294,7 +294,7 @@ RsRwTerminate(void)
  *****************************************************************************
  */
 RwBool
-RsRwInitialise(void *displayID)
+RsRwInitialize(void *displayID)
 {
 	RwEngineOpenParams  openParams;
 
@@ -383,7 +383,7 @@ RsTerminate(void)
  *****************************************************************************
  */
 RwBool
-RsInitialise(void)
+RsInitialize(void)
 {
 	/*
 	 * Initialize Platform independent data...
@@ -415,7 +415,7 @@ RsInitialise(void)
 	RsGlobal.pad.inputEventHandler = nil;
 	RsGlobal.pad.used = FALSE;
 
-	result = psInitialise();
+	result = psInitialize();
 
 	return result;
 }

src/skel/skeleton.h

@@ -61,10 +61,10 @@ enum RsEvent
 	_rs_18,
 	_rs_19,
 	_rs_20,
-	rsRWINITIALISE,
+	rsRWINITIALIZE,
 	rsRWTERMINATE,
 	rsSELECTDEVICE,
-	rsINITIALISE,
+	rsINITIALIZE,
 	rsTERMINATE,
 	rsIDLE,
 	rsFRONTENDIDLE,
@@ -242,13 +242,13 @@ extern RsEventStatus RsKeyboardEventHandler(RsEvent event, void *param);
 extern RsEventStatus RsPadEventHandler(RsEvent event, void *param);
 
 extern RwBool
-RsInitialise(void);
+RsInitialize(void);
 
 extern RwBool
 RsRegisterImageLoader(void);
 
 extern RwBool
-RsRwInitialise(void *param);
+RsRwInitialize(void *param);
 
 extern RwBool
 RsSelectDevice(void);

src/skel/win/win.cpp

@@ -584,7 +584,7 @@ void _psPrintCpuInfo()
  *****************************************************************************
  */
 RwBool
-psInitialise(void)
+psInitialize(void)
 {
 	PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
 
@@ -1525,7 +1525,7 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
 	
 	useDefault = TRUE;
 	
-	if ( RsEventHandler(rsRWINITIALISE, PSGLOBAL(window)) == rsEVENTERROR )
+	if ( RsEventHandler(rsRWINITIALIZE, PSGLOBAL(window)) == rsEVENTERROR )
 		return FALSE;
 	
 	RwInitialised = TRUE;
@@ -1896,7 +1896,7 @@ WinMain(HINSTANCE instance,
 	 * Initialize the platform independent data.
 	 * This will in turn initialize the platform specific data...
 	 */
-	if( RsEventHandler(rsINITIALISE, nil) == rsEVENTERROR )
+	if( RsEventHandler(rsINITIALIZE, nil) == rsEVENTERROR )
 	{
 		return FALSE;
 	}
@@ -1962,7 +1962,7 @@ WinMain(HINSTANCE instance,
 	/* 
 	 * Initialize the 3D (RenderWare) components of the app...
 	 */
-	if( rsEVENTERROR == RsEventHandler(rsRWINITIALISE, PSGLOBAL(window)) )
+	if( rsEVENTERROR == RsEventHandler(rsRWINITIALIZE, PSGLOBAL(window)) )
 	{
 		DestroyWindow(PSGLOBAL(window));
 

src/vehicles/Cranes.cpp

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

src/vehicles/Vehicle.h

@@ -109,9 +109,6 @@ enum eFlightModel
 	FLIGHT_MODEL_SEAPLANE
 };
 
-// Or Weapon.h?
-void FireOneInstantHitRound(CVector *shotSource, CVector *shotTarget, int32 damage);
-
 class CVehicle : public CPhysical
 {
 public: