Merge branch 'master' into master

2019-08-15 05:06:52 +03:00
parent 6093d855b0 cf8375343b
commit 6909fa283a
64 changed files with 6132 additions and 408 deletions
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -246,7 +246,7 @@ public:
 	void PlayLoadedMissionAudio(void);
 	bool IsMissionAudioSampleFinished(void);
 	void ClearMissionAudio(void);
-	
+
 	int32 GetRadioInCar(void);
 	void SetRadioInCar(uint32 radio);
 	void SetRadioChannel(int8 radio, int32 pos);