sync with upstream

2020-05-11 21:21:09 +03:00
parent 5f5babe7fe d9db03d606
commit 9b23e33c36
98 changed files with 19077 additions and 2212 deletions
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -197,7 +197,8 @@ 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
-//#define OPENAL
+//#define AUDIO_OAL
+#define AUDIO_MSS

 // Particle
 //#define PC_PARTICLE