Merge with upstream

2019-06-26 23:34:14 +03:00
parent cc731f4732 50cce3e586
commit 08b053a568
50 changed files with 4929 additions and 795 deletions
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -195,5 +195,7 @@ public:
 	int32 CreateEntity(int, void*);
 	void SetEntityStatus(int32, int8);
 	void SetRadioInCar(int32);
+	uint8 IsMP3RadioChannelAvailable();
+
 };
 extern cDMAudio &DMAudio;