merge upstream

premake5.lua

@@ -122,9 +122,11 @@ workspace "reVC"
 	
 	filter { "platforms:*x86*" }
 		architecture "x86"
+		floatingpoint "Fast"
 		
 	filter { "platforms:*amd64*" }
 		architecture "amd64"
+		floatingpoint "Fast"
 
 	filter { "platforms:*arm*" }
 		architecture "ARM"
@@ -185,6 +187,18 @@ project "librw"
 	files { path.join(Librw, "src/*.*") }
 	files { path.join(Librw, "src/*/*.*") }
 	
+	filter { "platforms:*x86*" }
+		architecture "x86"
+		floatingpoint "Fast"
+
+	filter { "platforms:*amd64*" }
+		architecture "amd64"
+		floatingpoint "Fast"
+
+	filter "platforms:win*"
+		staticruntime "on"
+		buildoptions { "/Zc:sizedDealloc-" }
+
 	filter "platforms:bsd*"
 		includedirs { "/usr/local/include" }
 		libdirs { "/usr/local/lib" }
@@ -196,6 +210,9 @@ project "librw"
 		libdirs { "/opt/local/lib" }
 		libdirs { "/usr/local/lib" }
 
+	filter "platforms:*gl3_glfw*"
+		staticruntime "off"
+	
 	filter "platforms:*RW34*"
 		flags { "ExcludeFromBuild" }
 	filter  {}
@@ -286,9 +303,14 @@ project "reVC"
 	filter "platforms:win*"
 		files { addSrcFiles("src/skel/win") }
 		includedirs { "src/skel/win" }
+		buildoptions { "/Zc:sizedDealloc-" }
 		linkoptions "/SAFESEH:NO"
 		characterset ("MBCS")
 		targetextension ".exe"
+		staticruntime "on"
+
+	filter "platforms:win*glfw*"
+		staticruntime "off"
 		
 	filter "platforms:win*oal"
 		includedirs { "vendor/openal-soft/include" }
@@ -324,7 +346,6 @@ project "reVC"
 	end
 
 	filter "platforms:*RW34*"
-		staticruntime "on"
 		includedirs { "sdk/rwsdk/include/d3d8" }
 		libdirs { "sdk/rwsdk/lib/d3d8/release" }
 		links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtanim", "rtcharse", "rpanisot" }

src/audio/AudioManager.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "audio_enums.h"
 #include "AudioCollision.h"
@@ -60,7 +60,7 @@ VALIDATE_SIZE(tAudioEntity, 40);
 class tPedComment
 {
 public:
-	int32 m_nSampleIndex;
+	uint32 m_nSampleIndex;
 	int32 m_nEntityIndex;
 	CVector m_vecPos;
 	float m_fDistance;
@@ -77,8 +77,10 @@ public:
 	uint8 m_nIndexMap[NUM_PED_COMMENTS_BANKS][NUM_PED_COMMENTS_SLOTS];
 	uint8 m_nCommentsInBank[NUM_PED_COMMENTS_BANKS];
 	uint8 m_nActiveBank;
+#ifdef GTA_PC
 	bool m_bDelay;
 	uint32 m_nDelayTimer;
+#endif
 
 	cPedComments()
 	{
@@ -92,8 +94,8 @@ public:
 			m_nCommentsInBank[i] = 0;
 		m_nActiveBank = 0;
 	}
-	void Add(tPedComment *com);
+	void Add(tPedComment *com); // done
-	void Process();
+	void Process();             // done
 };
 
 VALIDATE_SIZE(cPedComments, 0x490);
@@ -201,7 +203,7 @@ public:
 	uint8 m_nPlayerMood;
 	uint32 m_nPlayerMoodTimer;
 	uint8 field_rest[4];
-	uint8 field_4B3C;
+	bool m_bGenericSfx;
 
 	cPedComments m_sPedComments;
 	int32 m_nFireAudioEntity;
@@ -260,7 +262,101 @@ public:
 
 	// functions returning talk sfx,
 	// order from GetPedCommentSfx
-	// TODO: miami
+	uint32 GetPlayerTalkSfx(CPed *ped, int16 sound);
+	uint32 GetCopTalkSfx(CPed *ped, int16 sound);
+	uint32 GetSwatTalkSfx(CPed *ped, int16 sound);
+	uint32 GetFBITalkSfx(CPed *ped, int16 sound);
+	uint32 GetArmyTalkSfx(CPed *ped, int16 sound);
+	uint32 GetMedicTalkSfx(CPed *ped, int16 sound);
+	uint32 GetFiremanTalkSfx(CPed *ped, int16 sound);
+	uint32 GetDefaultTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFYSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFOSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHMYSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHMOSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFYRITalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFORITalkSfx(CPed *ped, int16 sound); 
+	uint32 GetHMYRITalkSfx(CPed *ped, int16 sound); 
+	uint32 GetHMORITalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFYBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFOBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetHMYBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetHMOBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFYBUTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFYMDTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFYCGTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFYPRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHFOTRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHMOTRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHMYAPTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHMOCATalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMODKTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMYCRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBFYSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBFOSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMYSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMOSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBFYRITalkSfx(CPed *ped, int16 sound);
+	uint32 GetBFORITalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMYRITalkSfx(CPed *ped, int16 sound);
+	uint32 GetBFYBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMYBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetBFOBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMOBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMYBUTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBFYPRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBFOTRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMOTRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMYPITalkSfx(CPed *ped, int16 sound);
+	uint32 GetBMYBBTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYCRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFOSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMOSTTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYRITalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFORITalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYRITalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMORITalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFOBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMOBETalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYCWTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYGOTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFOGOTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMOGOTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYLGTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYLGTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYBUTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYBUTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMOBUTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYPRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFOTRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMOTRTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYPITalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMOCATalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYJGTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYJGTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYSKTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWMYSKTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYSHTalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFOSHTalkSfx(CPed *ped, int16 sound);
+	uint32 GetJFOTOTalkSfx(CPed *ped, int16 sound);
+	uint32 GetJMOTOTalkSfx(CPed *ped, int16 sound);
+	uint32 GetCBTalkSfx(CPed *ped, int16 sound);
+	uint32 GetHNTalkSfx(CPed *ped, int16 sound);
+	uint32 GetSGTalkSfx(CPed *ped, int16 sound);
+	uint32 GetCLTalkSfx(CPed *ped, int16 sound);
+	uint32 GetGDTalkSfx(CPed *ped, int16 sound);
+	uint32 GetBKTalkSfx(CPed *ped, int16 sound);
+	uint32 GetPGTalkSfx(CPed *ped, int16 sound);
+	uint32 GetVICETalkSfx(CPed *ped, int16 sound, int16 model);
+	uint32 GetWFYG1TalkSfx(CPed *ped, int16 sound);
+	uint32 GetWFYG2TalkSfx(CPed *ped, int16 sound);
+
+	uint32 GetGenericMaleTalkSfx(CPed *ped, int16 sound);   // todo names (inlined in vc)
+	uint32 GetGenericFemaleTalkSfx(CPed *ped, int16 sound); // todo names (inlined in vc)
 	// end of functions returning talk sfx
 
 	void GenerateIntegerRandomNumberTable(); // done
@@ -276,10 +372,10 @@ public:
 	uint8 GetMissionAudioLoadingStatus(uint8 slot) const; // done
 	int8 GetMissionScriptPoliceAudioPlayingStatus() const;
 	uint8 GetNum3DProvidersAvailable() const; // done
-	int32 GetPedCommentSfx(CPed *ped, int32 sound);
+	uint32 GetPedCommentSfx(CPed *ped, int32 sound);
-	void GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint32 maxOffset) const;
+	void GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset) const;
-	float GetVehicleDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, float gasPedalAudio, cTransmission *transmission, float velocityChange); // done
+	float GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);
-	float GetVehicleNonDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, cTransmission *transmission, float velocityChange);                   // done
+	float GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);
 
 	bool HasAirBrakes(int32 model) const; // done
 
@@ -405,7 +501,7 @@ public:
 	bool SetupJumboRumbleSound(uint8 emittingVol);
 	bool SetupJumboTaxiSound(uint8 vol);
 	bool SetupJumboWhineSound(uint8 emittingVol, uint32 freq);
-	void SetupPedComments(cPedParams *params, uint32 sound);
+	void SetupPedComments(cPedParams *params, uint32 sound); // done
 	void SetupSuspectLastSeenReport();
 
 	void Terminate(); //done

src/audio/AudioSamples.h

@@ -1,9 +1,8 @@
-#pragma once
+#pragma once
 
 #include "common.h"
 
-enum eSfxSample : uint32
+enum eSfxSample : uint32 {
-{
 	SFX_CAR_HORN_JEEP = 0,
 	SFX_CAR_HORN_BMW328,
 	SFX_CAR_HORN_BUS,
@@ -576,6 +575,233 @@ enum eSfxSample : uint32
 	SFX_FOOTSTEP_SAND_4,
 
 	// TODO: miami ped comments... THERE'S OVER 9000
+	SFX_POLICE_BOAT_1 = 714,
+	SFX_POLICE_BOAT_2,
+	SFX_POLICE_BOAT_3,
+	SFX_POLICE_BOAT_4,
+	SFX_POLICE_BOAT_5,
+	SFX_POLICE_BOAT_6,
+	SFX_POLICE_BOAT_7,
+	SFX_POLICE_BOAT_8,
+	SFX_POLICE_BOAT_9,
+	SFX_POLICE_BOAT_10,
+	SFX_POLICE_BOAT_11,
+	SFX_POLICE_BOAT_12,
+	SFX_POLICE_BOAT_13,
+	SFX_POLICE_BOAT_14,
+	SFX_POLICE_BOAT_15,
+	SFX_POLICE_BOAT_16,
+	SFX_POLICE_BOAT_17,
+	SFX_POLICE_BOAT_18,
+	SFX_POLICE_BOAT_19,
+	SFX_POLICE_BOAT_20,
+	SFX_POLICE_BOAT_21,
+	SFX_POLICE_BOAT_22,
+	SFX_POLICE_BOAT_23,
+
+	SFX_POLICE_HELI_1,
+	SFX_POLICE_HELI_2,
+	SFX_POLICE_HELI_3,
+	SFX_POLICE_HELI_4,
+	SFX_POLICE_HELI_5,
+	SFX_POLICE_HELI_6,
+	SFX_POLICE_HELI_7,
+	SFX_POLICE_HELI_8,
+	SFX_POLICE_HELI_9,
+	SFX_POLICE_HELI_10,
+	SFX_POLICE_HELI_11,
+	SFX_POLICE_HELI_12,
+	SFX_POLICE_HELI_13,
+	SFX_POLICE_HELI_14,
+	SFX_POLICE_HELI_15,
+	SFX_POLICE_HELI_16,
+	SFX_POLICE_HELI_17,
+	SFX_POLICE_HELI_18,
+	SFX_POLICE_HELI_19,
+	SFX_POLICE_HELI_20,
+
+	SFX_GENERIC_FEMALE_GRUNT_1 = 2953,
+	SFX_GENERIC_FEMALE_GRUNT_2 = 2954,
+	SFX_GENERIC_FEMALE_GRUNT_3 = 2955,
+	SFX_GENERIC_FEMALE_GRUNT_4 = 2956,
+	SFX_GENERIC_FEMALE_GRUNT_5 = 2957,
+	SFX_GENERIC_FEMALE_GRUNT_6 = 2958,
+	SFX_GENERIC_FEMALE_GRUNT_7 = 2959,
+	SFX_GENERIC_FEMALE_GRUNT_8 = 2960,
+	SFX_GENERIC_FEMALE_GRUNT_9 = 2961,
+	SFX_GENERIC_FEMALE_GRUNT_10 = 2962,
+	SFX_GENERIC_FEMALE_GRUNT_11 = 2963,
+	SFX_GENERIC_FEMALE_GRUNT_12 = 2964,
+	SFX_GENERIC_FEMALE_GRUNT_13 = 2965,
+	SFX_GENERIC_FEMALE_GRUNT_14 = 2966,
+	SFX_GENERIC_FEMALE_GRUNT_15 = 2967,
+	SFX_GENERIC_FEMALE_GRUNT_16 = 2968,
+	SFX_GENERIC_FEMALE_GRUNT_17 = 2969,
+	SFX_GENERIC_FEMALE_GRUNT_18 = 2970,
+	SFX_GENERIC_FEMALE_GRUNT_19 = 2971,
+	SFX_GENERIC_FEMALE_GRUNT_20 = 2972,
+	SFX_GENERIC_FEMALE_GRUNT_21 = 2973,
+	SFX_GENERIC_FEMALE_GRUNT_22 = 2974,
+	SFX_GENERIC_FEMALE_GRUNT_23 = 2975,
+	SFX_GENERIC_FEMALE_GRUNT_24 = 2976,
+	SFX_GENERIC_FEMALE_GRUNT_25 = 2977,
+	SFX_GENERIC_FEMALE_GRUNT_26 = 2978,
+	SFX_GENERIC_FEMALE_GRUNT_27 = 2979,
+	SFX_GENERIC_FEMALE_GRUNT_28 = 2980,
+	SFX_GENERIC_FEMALE_GRUNT_29 = 2981,
+	SFX_GENERIC_FEMALE_GRUNT_30 = 2982,
+	SFX_GENERIC_FEMALE_GRUNT_31 = 2983,
+	SFX_GENERIC_FEMALE_GRUNT_32 = 2984,
+	SFX_GENERIC_FEMALE_GRUNT_33 = 2985,
+	SFX_GENERIC_MALE_FIRE_1 = 3013,
+	SFX_GENERIC_MALE_FIRE_2 = 3014,
+	SFX_GENERIC_MALE_FIRE_3 = 3015,
+	SFX_GENERIC_MALE_FIRE_4 = 3016,
+	SFX_GENERIC_MALE_FIRE_5 = 3017,
+	SFX_GENERIC_MALE_FIRE_6 = 3018,
+	SFX_GENERIC_MALE_FIRE_7 = 3019,
+	SFX_GENERIC_MALE_FIRE_8 = 3020,
+	SFX_GENERIC_MALE_FIRE_9 = 3021,
+	SFX_GENERIC_MALE_FIRE_10 = 3022,
+	SFX_GENERIC_MALE_FIRE_11 = 3023,
+	SFX_GENERIC_MALE_FIRE_12 = 3024,
+	SFX_GENERIC_MALE_FIRE_13 = 3025,
+	SFX_GENERIC_MALE_FIRE_14 = 3026,
+	SFX_GENERIC_MALE_FIRE_15 = 3027,
+	SFX_GENERIC_MALE_FIRE_16 = 3028,
+	SFX_GENERIC_MALE_FIRE_17 = 3029,
+	SFX_GENERIC_MALE_FIRE_18 = 3030,
+	SFX_GENERIC_MALE_FIRE_19 = 3031,
+	SFX_GENERIC_MALE_FIRE_20 = 3032,
+	SFX_GENERIC_MALE_FIRE_21 = 3033,
+	SFX_GENERIC_MALE_FIRE_22 = 3034,
+	SFX_GENERIC_MALE_FIRE_23 = 3035,
+	SFX_GENERIC_MALE_FIRE_24 = 3036,
+	SFX_GENERIC_MALE_FIRE_25 = 3037,
+	SFX_GENERIC_MALE_FIRE_26 = 3038,
+	SFX_GENERIC_MALE_FIRE_27 = 3039,
+	SFX_GENERIC_MALE_FIRE_28 = 3040,
+	SFX_GENERIC_MALE_FIRE_29 = 3041,
+	SFX_GENERIC_MALE_FIRE_30 = 3042,
+	SFX_GENERIC_MALE_FIRE_31 = 3043,
+	SFX_GENERIC_MALE_FIRE_32 = 3044,
+	SFX_GENERIC_MALE_DEATH_1 = 3045,
+	SFX_GENERIC_MALE_DEATH_2 = 3046,
+	SFX_GENERIC_MALE_DEATH_3 = 3047,
+	SFX_GENERIC_MALE_DEATH_4 = 3048,
+	SFX_GENERIC_MALE_DEATH_5 = 3049,
+	SFX_GENERIC_MALE_DEATH_6 = 3050,
+	SFX_GENERIC_MALE_DEATH_7 = 3051,
+	SFX_GENERIC_MALE_DEATH_8 = 3052,
+	SFX_GENERIC_MALE_DEATH_9 = 3053,
+	SFX_GENERIC_MALE_DEATH_10 = 3054,
+	SFX_GENERIC_MALE_DEATH_11 = 3055,
+	SFX_GENERIC_MALE_DEATH_12 = 3056,
+	SFX_GENERIC_MALE_DEATH_13 = 3057,
+	SFX_GENERIC_MALE_DEATH_14 = 3058,
+	SFX_GENERIC_MALE_DEATH_15 = 3059,
+	SFX_GENERIC_MALE_DEATH_16 = 3060,
+	SFX_GENERIC_MALE_DEATH_17 = 3061,
+	SFX_GENERIC_MALE_DEATH_18 = 3062,
+	SFX_GENERIC_MALE_DEATH_19 = 3063,
+	SFX_GENERIC_MALE_DEATH_20 = 3064,
+	SFX_GENERIC_MALE_DEATH_21 = 3065,
+	SFX_GENERIC_MALE_DEATH_22 = 3066,
+	SFX_GENERIC_MALE_DEATH_23 = 3067,
+	SFX_GENERIC_MALE_DEATH_24 = 3068,
+	SFX_GENERIC_MALE_DEATH_25 = 3069,
+	SFX_GENERIC_MALE_DEATH_26 = 3070,
+	SFX_GENERIC_MALE_DEATH_27 = 3071,
+	SFX_GENERIC_MALE_DEATH_28 = 3072,
+	SFX_GENERIC_MALE_DEATH_29 = 3073,
+	SFX_GENERIC_MALE_DEATH_30 = 3074,
+	SFX_GENERIC_MALE_DEATH_31 = 3075,
+	SFX_GENERIC_MALE_DEATH_32 = 3076,
+	SFX_GENERIC_MALE_DEATH_33 = 3077,
+	SFX_GENERIC_MALE_DEATH_34 = 3078,
+	SFX_GENERIC_MALE_DEATH_35 = 3079,
+	SFX_GENERIC_MALE_DEATH_36 = 3080,
+	SFX_GENERIC_MALE_DEATH_37 = 3081,
+	SFX_GENERIC_MALE_DEATH_38 = 3082,
+	SFX_GENERIC_MALE_DEATH_39 = 3083,
+	SFX_GENERIC_MALE_DEATH_40 = 3084,
+	SFX_GENERIC_MALE_DEATH_41 = 3085,
+	SFX_GENERIC_MALE_GRUNT_1 = 3086,
+	SFX_GENERIC_MALE_GRUNT_2 = 3087,
+	SFX_GENERIC_MALE_GRUNT_3 = 3088,
+	SFX_GENERIC_MALE_GRUNT_4 = 3089,
+	SFX_GENERIC_MALE_GRUNT_5 = 3090,
+	SFX_GENERIC_MALE_GRUNT_6 = 3091,
+	SFX_GENERIC_MALE_GRUNT_7 = 3092,
+	SFX_GENERIC_MALE_GRUNT_8 = 3093,
+	SFX_GENERIC_MALE_GRUNT_9 = 3094,
+	SFX_GENERIC_MALE_GRUNT_10 = 3095,
+	SFX_GENERIC_MALE_GRUNT_11 = 3096,
+	SFX_GENERIC_MALE_GRUNT_12 = 3097,
+	SFX_GENERIC_MALE_GRUNT_13 = 3098,
+	SFX_GENERIC_MALE_GRUNT_14 = 3099,
+	SFX_GENERIC_MALE_GRUNT_15 = 3100,
+	SFX_GENERIC_MALE_GRUNT_16 = 3101,
+	SFX_GENERIC_MALE_GRUNT_17 = 3102,
+	SFX_GENERIC_MALE_GRUNT_18 = 3103,
+	SFX_GENERIC_MALE_GRUNT_19 = 3104,
+	SFX_GENERIC_MALE_GRUNT_20 = 3105,
+	SFX_GENERIC_MALE_GRUNT_21 = 3106,
+	SFX_GENERIC_MALE_GRUNT_22 = 3107,
+	SFX_GENERIC_MALE_GRUNT_23 = 3108,
+	SFX_GENERIC_MALE_GRUNT_24 = 3109,
+	SFX_GENERIC_MALE_GRUNT_25 = 3110,
+	SFX_GENERIC_MALE_GRUNT_26 = 3111,
+	SFX_GENERIC_MALE_GRUNT_27 = 3112,
+	SFX_GENERIC_MALE_GRUNT_28 = 3113,
+	SFX_GENERIC_MALE_GRUNT_29 = 3114,
+	SFX_GENERIC_MALE_GRUNT_30 = 3115,
+	SFX_GENERIC_MALE_GRUNT_31 = 3116,
+	SFX_GENERIC_MALE_GRUNT_32 = 3117,
+	SFX_GENERIC_MALE_GRUNT_33 = 3118,
+	SFX_GENERIC_MALE_GRUNT_34 = 3119,
+	SFX_GENERIC_MALE_GRUNT_35 = 3120,
+	SFX_GENERIC_MALE_GRUNT_36 = 3121,
+	SFX_GENERIC_MALE_GRUNT_37 = 3122,
+	SFX_GENERIC_MALE_GRUNT_38 = 3123,
+	SFX_GENERIC_MALE_GRUNT_39 = 3124,
+	SFX_GENERIC_MALE_GRUNT_40 = 3125,
+	SFX_GENERIC_MALE_GRUNT_41 = 3126,
+	SFX_GENERIC_MALE_PANIC_1 = 3127,
+	SFX_GENERIC_MALE_PANIC_2 = 3128,
+	SFX_GENERIC_MALE_PANIC_3 = 3129,
+	SFX_GENERIC_MALE_PANIC_4 = 3130,
+	SFX_GENERIC_MALE_PANIC_5 = 3131,
+	SFX_GENERIC_MALE_PANIC_6 = 3132,
+	SFX_GENERIC_MALE_PANIC_7 = 3133,
+	SFX_GENERIC_MALE_PANIC_8 = 3134,
+	SFX_GENERIC_MALE_PANIC_9 = 3135,
+	SFX_GENERIC_MALE_PANIC_10 = 3136,
+	SFX_GENERIC_MALE_PANIC_11 = 3137,
+	SFX_GENERIC_MALE_PANIC_12 = 3138,
+	SFX_GENERIC_MALE_PANIC_13 = 3139,
+	SFX_GENERIC_MALE_PANIC_14 = 3140,
+	SFX_GENERIC_MALE_PANIC_15 = 3141,
+	SFX_GENERIC_MALE_PANIC_16 = 3142,
+	SFX_GENERIC_MALE_PANIC_17 = 3143,
+	SFX_GENERIC_MALE_PANIC_18 = 3144,
+	SFX_GENERIC_MALE_PANIC_19 = 3145,
+	SFX_GENERIC_MALE_PANIC_20 = 3146,
+	SFX_GENERIC_MALE_PANIC_21 = 3147,
+	SFX_GENERIC_MALE_PANIC_22 = 3148,
+	SFX_GENERIC_MALE_PANIC_23 = 3149,
+	SFX_GENERIC_MALE_PANIC_24 = 3150,
+	SFX_GENERIC_MALE_PANIC_25 = 3151,
+	SFX_GENERIC_MALE_PANIC_26 = 3152,
+	SFX_GENERIC_MALE_PANIC_27 = 3153,
+	SFX_GENERIC_MALE_PANIC_28 = 3154,
+	SFX_GENERIC_MALE_PANIC_29 = 3155,
+	SFX_GENERIC_MALE_PANIC_30 = 3156,
+	SFX_GENERIC_MALE_PANIC_31 = 3157,
+	SFX_GENERIC_MALE_PANIC_32 = 3158,
+	SFX_GENERIC_MALE_PANIC_33 = 3159,
+	SFX_GENERIC_MALE_PANIC_34 = 3160,
+	SFX_GENERIC_MALE_PANIC_35 = 3161,
 
 	TOTAL_AUDIO_SAMPLES = 9941,
 	NO_SAMPLE,

src/audio/soundlist.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 enum eSound : uint16
 {
@@ -116,8 +116,8 @@ enum eSound : uint16
 	SOUND_PED_MIAMIVICE_EXITING_CAR,
 	SOUND_PED_COP_HELIPILOTPHRASE,
 	SOUND_PED_PULLOUTWEAPON,
-	SOUND_PED_HELI_PLAYER_FOUND,
+	SOUND_PED_HELI_PLAYER_FOUND = 114,
-	SOUND_115,
+	SOUND_PED_VCPA_PLAYER_FOUND = 115,
 	SOUND_PED_ON_FIRE,
 	SOUND_PED_AIMING,
 	SOUND_PED_HANDS_UP,

src/control/Pickups.cpp

@@ -508,7 +508,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 				result = true;
 				Remove();
 				DMAudio.PlayFrontEndSound(SOUND_PICKUP_HIDDEN_PACKAGE, 0);
-				return true;
+				break;
 			case PICKUP_MONEY:
 				CWorld::Players[playerId].m_nMoney += m_nQuantity;
 				sprintf(gString, "$%d", m_nQuantity);
@@ -518,12 +518,13 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 				result = true;
 				Remove();
 				DMAudio.PlayFrontEndSound(SOUND_PICKUP_MONEY, 0);
-				return true;
+				player->Say(SOUND_PED_MUGGING);
+				break;
 			case PICKUP_ASSET_REVENUE:
 				CWorld::Players[CWorld::PlayerInFocus].m_nMoney += m_fRevenue;
 				m_fRevenue = 0.0f;
 				DMAudio.PlayFrontEndSound(SOUND_PICKUP_MONEY, 0);
-				return false;
+				break;
 			case PICKUP_PROPERTY_LOCKED:
 				if (!m_bWasControlMessageShown) {
 					m_bWasControlMessageShown = true;

src/control/Replay.cpp

@@ -53,7 +53,7 @@
 #include "Fluff.h"
 #include "WaterCreatures.h"
 
-//--MIAMI: file done except TODO
+//--MIAMI: file done
 
 uint8 CReplay::Mode;
 CAddressInReplayBuffer CReplay::Record;
@@ -158,7 +158,7 @@ static void(*CBArray[])(CAnimBlendAssociation*, void*) =
 	&CPed::FinishedAttackCB,
 	&CPed::FinishFightMoveCB, &PhonePutDownCB, &PhonePickUpCB, &CPed::PedAnimDoorCloseRollingCB, &CPed::FinishJumpCB,
 	&CPed::PedLandCB, &CPed::RestoreHeadingRateCB, &CPed::PedSetQuickDraggedOutCarPositionCB, &CPed::PedSetDraggedOutCarPositionCB,
-	&CPed::PedSetPreviousStateCB, &CPed::FinishedReloadCB, /*&CPed::PedSetGetInCarPositionCB, TODO(MIAMI)*/
+	&CPed::PedSetPreviousStateCB, &CPed::FinishedReloadCB, &CPed::PedSetGetInCarPositionCB,
 	&CPed::PedAnimShuffleCB, &CPed::DeleteSunbatheIdleAnimCB, &StartTalkingOnMobileCB, &FinishTalkingOnMobileCB
 };
 
@@ -396,7 +396,8 @@ void CReplay::RecordThisFrame(void)
 	misc->cam_shake_start = TheCamera.m_uiCamShakeStart;
 	misc->cam_shake_strength = TheCamera.m_fCamShakeForce;
 	misc->cur_area = CGame::currArea;
-	//misc->special_fx_flags; // TODO(MIAMI)!!!
+	misc->video_cam = CSpecialFX::bVideoCam;
+	misc->lift_cam = CSpecialFX::bLiftCam;
 	Record.m_nOffset += sizeof(*misc);
 	tEndOfFramePacket* eof = (tEndOfFramePacket*)&Record.m_pBase[Record.m_nOffset];
 	eof->type = REPLAYPACKET_ENDOFFRAME;
@@ -1139,7 +1140,8 @@ bool CReplay::PlayBackThisFrameInterpolation(CAddressInReplayBuffer *buffer, flo
 			tMiscPacket* pm = (tMiscPacket*)&ptr[offset];
 			TheCamera.m_uiCamShakeStart = pm->cam_shake_start;
 			TheCamera.m_fCamShakeForce = pm->cam_shake_strength;
-			// TODO(MIAMI): SpecialFX
+			CSpecialFX::bVideoCam = pm->video_cam;
+			CSpecialFX::bLiftCam = pm->lift_cam;
 			CGame::currArea = pm->cur_area;
 			buffer->m_nOffset += sizeof(tMiscPacket);
 			break;

src/control/Replay.h

@@ -263,7 +263,8 @@ class CReplay
 		uint32 cam_shake_start;
 		float cam_shake_strength;
 		uint8 cur_area;
-		uint8 special_fx_flags;
+		uint8 video_cam : 1;
+		uint8 lift_cam : 1;
 	};
 
 	VALIDATE_SIZE(tMiscPacket, 16);

src/control/Script.cpp

@@ -88,6 +88,8 @@
 #include <stdarg.h>
 #endif
 
+//--MIAMI: file done
+
 #define PICKUP_PLACEMENT_OFFSET 0.5f
 #define PED_FIND_Z_OFFSET 5.0f
 #define COP_PED_FIND_Z_OFFSET 10.0f
@@ -9113,12 +9115,16 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 						switch (pPed->m_vehEnterType) {
 						case CAR_DOOR_LF:
 							flags = pPed->m_pMyVehicle->m_nNumMaxPassengers != 0 ? CAR_DOOR_FLAG_LF : CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_LR;
+							break;
 						case CAR_DOOR_LR:
 							flags = pPed->m_pMyVehicle->m_nNumMaxPassengers != 0 ? CAR_DOOR_FLAG_RF : CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_LR;
+							break;
 						case CAR_DOOR_RF:
 							flags = CAR_DOOR_FLAG_RF;
+							break;
 						case CAR_DOOR_RR:
 							flags = CAR_DOOR_FLAG_RR;
+							break;
 						}
 					}
 					pPed->m_pMyVehicle->m_nGettingOutFlags &= ~flags;
@@ -12119,14 +12125,14 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	{
 		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
 		CollectParameters(&m_nIp, 1);
-		UpdateCompareFlag(*ptr = ScriptParams[0]);
+		UpdateCompareFlag(*ptr == ScriptParams[0]);
 		return 0;
 	}
 	case COMMAND_IS_INT_LVAR_EQUAL_TO_CONSTANT:
 	{
 		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
 		CollectParameters(&m_nIp, 1);
-		UpdateCompareFlag(*ptr = ScriptParams[0]);
+		UpdateCompareFlag(*ptr == ScriptParams[0]);
 		return 0;
 	}
 	case COMMAND_GET_DEAD_CHAR_PICKUP_COORDS:
@@ -12274,7 +12280,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
 	case COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_VAR:
 	{
 		CollectParameters(&m_nIp, 1);
-		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
 		UpdateCompareFlag(ScriptParams[0] >= *ptr);
 		return 0;
 	}
@@ -15751,7 +15757,7 @@ INITSAVEBUF
 	uint32 script_data_size = SCRIPT_DATA_SIZE;
 	WriteSaveBuf(buf, script_data_size);
 	WriteSaveBuf(buf, OnAMissionFlag);
-	WriteSaveBuf(buf, NextFreeCollectiveIndex);
+	WriteSaveBuf(buf, LastMissionPassedTime);
 	for (uint32 i = 0; i < MAX_NUM_BUILDING_SWAPS; i++) {
 		CBuilding* pBuilding = BuildingSwapArray[i].m_pBuilding;
 		uint32 type, handle;
@@ -15801,12 +15807,12 @@ INITSAVEBUF
 		WriteSaveBuf(buf, handle);
 	}
 	WriteSaveBuf(buf, bUsingAMultiScriptFile);
-	WriteSaveBuf(buf, (uint8)0);
+	WriteSaveBuf(buf, bPlayerHasMetDebbieHarry);
 	WriteSaveBuf(buf, (uint16)0);
 	WriteSaveBuf(buf, MainScriptSize);
 	WriteSaveBuf(buf, LargestMissionScriptSize);
 	WriteSaveBuf(buf, NumberOfMissionScripts);
-	WriteSaveBuf(buf, (uint16)0);
+	WriteSaveBuf(buf, NumberOfExclusiveMissionScripts);
 	WriteSaveBuf(buf, runningScripts);
 	for (CRunningScript* pScript = pActiveScripts; pScript; pScript = pScript->GetNext())
 		pScript->Save(buf);
@@ -15823,7 +15829,7 @@ INITSAVEBUF
 		ScriptSpace[i] = ReadSaveBuf<uint8>(buf);
 	script_assert(ReadSaveBuf<uint32>(buf) == SCRIPT_DATA_SIZE);
 	OnAMissionFlag = ReadSaveBuf<uint32>(buf);
-	NextFreeCollectiveIndex = ReadSaveBuf<uint32>(buf);
+	LastMissionPassedTime = ReadSaveBuf<uint32>(buf);
 	for (uint32 i = 0; i < MAX_NUM_BUILDING_SWAPS; i++) {
 		uint32 type = ReadSaveBuf<uint32>(buf);
 		uint32 handle = ReadSaveBuf<uint32>(buf);
@@ -15871,12 +15877,12 @@ INITSAVEBUF
 			InvisibilitySettingArray[i]->bIsVisible = false;
 	}
 	script_assert(ReadSaveBuf<bool>(buf) == bUsingAMultiScriptFile);
-	ReadSaveBuf<uint8>(buf);
+	bPlayerHasMetDebbieHarry = ReadSaveBuf<uint8>(buf);
 	ReadSaveBuf<uint16>(buf);
 	script_assert(ReadSaveBuf<uint32>(buf) == MainScriptSize);
 	script_assert(ReadSaveBuf<uint32>(buf) == LargestMissionScriptSize);
 	script_assert(ReadSaveBuf<uint16>(buf) == NumberOfMissionScripts);
-	ReadSaveBuf<uint16>(buf);
+	script_assert(ReadSaveBuf<uint16>(buf) == NumberOfExclusiveMissionScripts);
 	uint32 runningScripts = ReadSaveBuf<uint32>(buf);
 	for (uint32 i = 0; i < runningScripts; i++)
 		StartNewScript(0)->Load(buf);
@@ -16103,7 +16109,7 @@ void CTheScripts::CleanUpThisObject(CObject* pObject)
 	if (pObject->ObjectCreatedBy != MISSION_OBJECT)
 		return;
 	pObject->ObjectCreatedBy = TEMP_OBJECT;
-	pObject->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 20000;
+	pObject->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 20000000;
 	pObject->m_nRefModelIndex = -1;
 	pObject->bUseVehicleColours = false;
 	++CObject::nNoTempObjects;

src/core/Cam.cpp

@@ -4626,7 +4626,7 @@ CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrient
 */
 	{
 		LookLeftRight = -CPad::GetPad(0)->LookAroundLeftRight();
-		LookUpDown = -CPad::GetPad(0)->LookAroundUpDown();
+		LookUpDown = CPad::GetPad(0)->LookAroundUpDown();
 	}
 	float AlphaOffset, BetaOffset;
 	if(UseMouse){

src/core/Pad.cpp

@@ -3222,6 +3222,9 @@ int16 CPad::SniperModeLookUpDown(void)
 	int16 axis = NewState.LeftStickY;
 	int16 dpad;
 
+#ifdef FIX_BUGS
+	axis = -axis;
+#endif
 	if (CPad::bInvertLook4Pad) {
 		axis = -axis;
 		dpad = (NewState.DPadDown - NewState.DPadUp) / 2;
@@ -3257,7 +3260,9 @@ int16 CPad::LookAroundLeftRight(void)
 int16 CPad::LookAroundUpDown(void)
 {
 	int16 axis = GetPad(0)->NewState.RightStickY;
-
+#ifdef FIX_BUGS
+	axis = -axis;
+#endif
 	if (CPad::bInvertLook4Pad)
 		axis = -axis;
 

src/core/config.h

@@ -243,8 +243,10 @@ enum Config {
 //#define NO_ISLAND_LOADING  // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
 //#define USE_TEXTURE_POOL
 //#define CUTSCENE_BORDERS_SWITCH
+#ifdef LIBRW
 //#define EXTENDED_COLOURFILTER		// more options for colour filter (replaces mblur)
 //#define EXTENDED_PIPELINES		// custom render pipelines (includes Neo)
+#endif
 //#define MULTISAMPLING		// adds MSAA option TODO
 
 #ifdef LIBRW

src/fakerw/fake.cpp

@@ -462,6 +462,53 @@ RwBool RwIm3DRenderPrimitive(RwPrimitiveType primType);
 
 
 
+RwBool RwRenderStateGet(RwRenderState state, void *value)
+{
+	uint32 *uival = (uint32*)value;
+	uint32 fog;
+	switch(state){
+	case rwRENDERSTATETEXTURERASTER: *(void**)value = GetRenderStatePtr(TEXTURERASTER); return true;
+	case rwRENDERSTATETEXTUREADDRESS: *uival = GetRenderState(TEXTUREADDRESS); return true;
+	case rwRENDERSTATETEXTUREADDRESSU: *uival = GetRenderState(TEXTUREADDRESSU); return true;
+	case rwRENDERSTATETEXTUREADDRESSV: *uival = GetRenderState(TEXTUREADDRESSV); return true;
+	case rwRENDERSTATETEXTUREPERSPECTIVE: *uival = 1; return true;
+	case rwRENDERSTATEZTESTENABLE: *uival = GetRenderState(ZTESTENABLE); return true;
+	case rwRENDERSTATESHADEMODE: *uival = rwSHADEMODEGOURAUD; return true;
+	case rwRENDERSTATEZWRITEENABLE: *uival = GetRenderState(ZWRITEENABLE); return true;
+	case rwRENDERSTATETEXTUREFILTER: *uival = GetRenderState(TEXTUREFILTER); return true;
+	case rwRENDERSTATESRCBLEND: *uival = GetRenderState(SRCBLEND); return true;
+	case rwRENDERSTATEDESTBLEND: *uival = GetRenderState(DESTBLEND); return true;
+	case rwRENDERSTATEVERTEXALPHAENABLE: *uival = GetRenderState(VERTEXALPHA); return true;
+	case rwRENDERSTATEBORDERCOLOR: *uival = 0; return true;
+	case rwRENDERSTATEFOGENABLE: *uival = GetRenderState(FOGENABLE); return true;
+	case rwRENDERSTATEFOGCOLOR:
+		// have to swap R and B here
+		fog = GetRenderState(FOGCOLOR);
+		*uival = (fog>>16)&0xFF;
+		*uival |= (fog&0xFF)<<16;
+		*uival |= fog&0xFF00;
+		*uival |= fog&0xFF000000;
+		return true;
+	case rwRENDERSTATEFOGTYPE: *uival = rwFOGTYPELINEAR; return true;
+	case rwRENDERSTATEFOGDENSITY: *(float*)value = 1.0f; return true;
+	case rwRENDERSTATECULLMODE: *uival = GetRenderState(CULLMODE); return true;
+
+	// all unsupported
+	case rwRENDERSTATEFOGTABLE:
+	case rwRENDERSTATEALPHAPRIMITIVEBUFFER:
+
+	case rwRENDERSTATESTENCILENABLE:
+	case rwRENDERSTATESTENCILFAIL:
+	case rwRENDERSTATESTENCILZFAIL:
+	case rwRENDERSTATESTENCILPASS:
+	case rwRENDERSTATESTENCILFUNCTION:
+	case rwRENDERSTATESTENCILFUNCTIONREF:
+	case rwRENDERSTATESTENCILFUNCTIONMASK:
+	case rwRENDERSTATESTENCILFUNCTIONWRITEMASK:
+	default:
+		return false;
+	}
+}
 RwBool RwRenderStateSet(RwRenderState state, void *value)
 {
 	uint32 uival = (uintptr)value;

src/peds/Ped.cpp

@@ -522,7 +522,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_delayedSoundID = -1;
 	m_delayedSoundTimer = 0;
 	CPopulation::UpdatePedCount((ePedType)m_nPedType, false);
-	m_lastComment = -1;
+	m_lastComment = UINT32_MAX;
 }
 
 // --MIAMI: Done
@@ -21440,3 +21440,17 @@ CPed::SetLook(float direction)
 		SetLookFlag(direction, false);
 	}
 }
+
+// --MIAMI: Done
+// Unused
+void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
+{
+	CPed* pPed = (CPed*)arg;
+	CMatrix mat(pPed->GetMatrix());
+	CVehicle* pVehicle = pPed->m_pMyVehicle;
+	const CVector& offset = (pVehicle->bIsVan && (pPed->m_vehEnterType == CAR_DOOR_RR || pPed->m_vehEnterType == CAR_DOOR_LR)) ? vecPedVanRearDoorAnimOffset : vecPedCarDoorAnimOffset;
+	CVector position = Multiply3x3(mat, offset) + pPed->GetPosition();
+	CPedPlacement::FindZCoorForPed(&position);
+	pPed->SetMoveSpeed(0.0f, 0.0f, 0.0f);
+	pPed->SetPosition(position);
+}

src/peds/Ped.h

@@ -646,7 +646,7 @@ public:
 	uint16 m_lastQueuedSound;
 	uint16 m_queuedSound;
 	bool m_canTalk;
-	int32 m_lastComment;
+	uint32 m_lastComment;
 	CVector m_vecSeekPosEx; // used for OBJECTIVE_GUARD_SPOT
 	float m_distanceToCountSeekDoneEx; // used for OBJECTIVE_GUARD_SPOT
 
@@ -911,6 +911,7 @@ public:
 	static void DeleteSunbatheIdleAnimCB(CAnimBlendAssociation *assoc, void *arg);
 	static void PedSetPreviousStateCB(CAnimBlendAssociation *assoc, void *arg);
 	static void PedAnimShuffleCB(CAnimBlendAssociation *assoc, void *arg);
+	static void PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg);
 
 	bool IsPlayer(void);
 	bool IsFemale(void) { return m_nPedType == PEDTYPE_CIVFEMALE || m_nPedType == PEDTYPE_PROSTITUTE; }

src/peds/PedAttractor.cpp

@@ -136,7 +136,7 @@ void CPedAttractorManager::RemoveIceCreamVanEffects(C2dEffect* pEffect)
 		return;
 	for (std::vector<CVehicleToEffect>::const_iterator assoc = vVehicleToEffect.cbegin(); assoc != vVehicleToEffect.cend();) {
 		if (assoc->GetVehicle() != pVehicle) {
-			assoc++;
+			++assoc;
 			continue;
 		}
 		uint32 total = 0;
@@ -145,7 +145,7 @@ void CPedAttractorManager::RemoveIceCreamVanEffects(C2dEffect* pEffect)
 				total++;
 		}
 		if (total > 0)
-			assoc++;
+			++assoc;
 		else
 			assoc = vVehicleToEffect.erase(assoc);
 	}

src/peds/PlayerPed.cpp

@@ -1055,6 +1055,7 @@ CPlayerPed::FindWeaponLockOnTarget(void)
 	if (nextTarget)
 		nextTarget->RegisterReference((CEntity**)&m_pPointGunAt);
 	SetPointGunAt(nextTarget);
+	Say(SOUND_PED_AIMING);
 	return true;
 }
 

src/render/Fluff.cpp

@@ -418,7 +418,7 @@ void CMovingThings::Init()
 	}
 
 	CEscalators::Init();
-	aScrollBars[0].Init(CVector(-1069.209f, 1320.126f, 18.848f), CVector(-1069.209f, 1342.299f, 22.612), SCROLL_ARENA_STRING, 128, 255, 0, 0.3f);
+	aScrollBars[0].Init(CVector(-1069.209f, 1320.126f, 18.848f), CVector(-1069.209f, 1342.299f, 22.612f), SCROLL_ARENA_STRING, 128, 255, 0, 0.3f);
 }
 
 void CMovingThings::Shutdown()

src/vehicles/Bike.cpp

@@ -792,7 +792,7 @@ CBike::ProcessControl(void)
 					   CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[rearLine].surfaceB) == ADHESIVE_SAND)
 						steer *= pBikeHandling->fSlipSteer;
 					f = Asin(Min(steer/SQR(fwdSpeed), 1.0))/DEGTORAD(pHandling->fSteeringLock);
-					if(m_fSteerAngle < 0.0f && m_fLeanLRAngle < 0.0f &&
+					if(m_fSteerAngle < 0.0f && m_fLeanLRAngle < 0.0f ||
 					   m_fSteerAngle > 0.0f && m_fLeanLRAngle > 0.0f)
 						f *= 2.0f;
 					f = Min(f, 1.0f);

src/vehicles/Boat.cpp

@@ -1,4 +1,4 @@
-#include "common.h"
+#include "common.h"
 
 #include "General.h"
 #include "Timecycle.h"
@@ -145,7 +145,7 @@ CBoat::ProcessControl(void)
 		    AutoPilot.m_nCarMission == MISSION_BLOCKPLAYER_CLOSE || 
 		    AutoPilot.m_nCarMission == MISSION_ATTACKPLAYER) &&
 		   CTimer::GetTimeInMilliseconds() > m_nPoliceShoutTimer){
-			DMAudio.PlayOneShot(m_audioEntityId, SOUND_115, 0.0f);
+			DMAudio.PlayOneShot(m_audioEntityId, SOUND_PED_VCPA_PLAYER_FOUND, 0.0f);
 			m_nPoliceShoutTimer = CTimer::GetTimeInMilliseconds() + 4500 + (CGeneral::GetRandomNumber()&0xFFF);
 		}
 	}