4 files changed, 59 insertions, 65 deletions

diff --git a/src/audio/oal/oal_utils.cpp b/src/audio/oal/oal_utils.cpp
index a2df61c1..4119672f 100644
--- a/src/audio/oal/oal_utils.cpp
+++ b/src/audio/oal/oal_utils.cpp
@@ -39,26 +39,20 @@ LPALGETFILTERFV alGetFilterfv;
 
 void EFXInit()
 {
-	if (alIsExtensionPresent((ALchar*)"EAX3.0"))
-		DEV("\nBIG EAX IN TOWN\n");
-	else
-		DEV("\nNO EAX\n");
-	
-	
-	 /* Define a macro to help load the function pointers. */
+	/* Define a macro to help load the function pointers. */
 #define LOAD_PROC(T, x)  ((x) = (T)alGetProcAddress(#x))
-    LOAD_PROC(LPALGENEFFECTS, alGenEffects);
-    LOAD_PROC(LPALDELETEEFFECTS, alDeleteEffects);
-    LOAD_PROC(LPALISEFFECT, alIsEffect);
-    LOAD_PROC(LPALEFFECTI, alEffecti);
-    LOAD_PROC(LPALEFFECTIV, alEffectiv);
-    LOAD_PROC(LPALEFFECTF, alEffectf);
-    LOAD_PROC(LPALEFFECTFV, alEffectfv);
-    LOAD_PROC(LPALGETEFFECTI, alGetEffecti);
-    LOAD_PROC(LPALGETEFFECTIV, alGetEffectiv);
-    LOAD_PROC(LPALGETEFFECTF, alGetEffectf);
-    LOAD_PROC(LPALGETEFFECTFV, alGetEffectfv);
-
+	LOAD_PROC(LPALGENEFFECTS, alGenEffects);
+	LOAD_PROC(LPALDELETEEFFECTS, alDeleteEffects);
+	LOAD_PROC(LPALISEFFECT, alIsEffect);
+	LOAD_PROC(LPALEFFECTI, alEffecti);
+	LOAD_PROC(LPALEFFECTIV, alEffectiv);
+	LOAD_PROC(LPALEFFECTF, alEffectf);
+	LOAD_PROC(LPALEFFECTFV, alEffectfv);
+	LOAD_PROC(LPALGETEFFECTI, alGetEffecti);
+	LOAD_PROC(LPALGETEFFECTIV, alGetEffectiv);
+	LOAD_PROC(LPALGETEFFECTF, alGetEffectf);
+	LOAD_PROC(LPALGETEFFECTFV, alGetEffectfv);
+	
 	LOAD_PROC(LPALGENFILTERS, alGenFilters);
 	LOAD_PROC(LPALDELETEFILTERS, alDeleteFilters);
 	LOAD_PROC(LPALISFILTER, alIsFilter);
@@ -70,22 +64,21 @@ void EFXInit()
 	LOAD_PROC(LPALGETFILTERIV, alGetFilteriv);
 	LOAD_PROC(LPALGETFILTERF, alGetFilterf);
 	LOAD_PROC(LPALGETFILTERFV, alGetFilterfv);
-
-    LOAD_PROC(LPALGENAUXILIARYEFFECTSLOTS, alGenAuxiliaryEffectSlots);
-    LOAD_PROC(LPALDELETEAUXILIARYEFFECTSLOTS, alDeleteAuxiliaryEffectSlots);
-    LOAD_PROC(LPALISAUXILIARYEFFECTSLOT, alIsAuxiliaryEffectSlot);
-    LOAD_PROC(LPALAUXILIARYEFFECTSLOTI, alAuxiliaryEffectSloti);
-    LOAD_PROC(LPALAUXILIARYEFFECTSLOTIV, alAuxiliaryEffectSlotiv);
-    LOAD_PROC(LPALAUXILIARYEFFECTSLOTF, alAuxiliaryEffectSlotf);
-    LOAD_PROC(LPALAUXILIARYEFFECTSLOTFV, alAuxiliaryEffectSlotfv);
-    LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTI, alGetAuxiliaryEffectSloti);
-    LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTIV, alGetAuxiliaryEffectSlotiv);
-    LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTF, alGetAuxiliaryEffectSlotf);
-    LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTFV, alGetAuxiliaryEffectSlotfv);
+	
+	LOAD_PROC(LPALGENAUXILIARYEFFECTSLOTS, alGenAuxiliaryEffectSlots);
+	LOAD_PROC(LPALDELETEAUXILIARYEFFECTSLOTS, alDeleteAuxiliaryEffectSlots);
+	LOAD_PROC(LPALISAUXILIARYEFFECTSLOT, alIsAuxiliaryEffectSlot);
+	LOAD_PROC(LPALAUXILIARYEFFECTSLOTI, alAuxiliaryEffectSloti);
+	LOAD_PROC(LPALAUXILIARYEFFECTSLOTIV, alAuxiliaryEffectSlotiv);
+	LOAD_PROC(LPALAUXILIARYEFFECTSLOTF, alAuxiliaryEffectSlotf);
+	LOAD_PROC(LPALAUXILIARYEFFECTSLOTFV, alAuxiliaryEffectSlotfv);
+	LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTI, alGetAuxiliaryEffectSloti);
+	LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTIV, alGetAuxiliaryEffectSlotiv);
+	LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTF, alGetAuxiliaryEffectSlotf);
+	LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTFV, alGetAuxiliaryEffectSlotfv);
 #undef LOAD_PROC
 }
 
-
 void SetEffectsLevel(ALuint uiFilter, float level)
 {
 	alFilteri(uiFilter, AL_FILTER_TYPE, AL_FILTER_LOWPASS);
@@ -103,7 +96,7 @@ static inline float mB_to_gain(float millibels)
     return (millibels > -10000.0f) ? powf(10.0f, millibels/2000.0f) : 0.0f;
 }
 
-static inline FLOAT clampF(FLOAT val, FLOAT minval, FLOAT maxval)
+static inline float clampF(float val, float minval, float maxval)
 {
     if(val >= maxval) return maxval;
     if(val <= minval) return minval;
@@ -113,35 +106,35 @@ static inline FLOAT clampF(FLOAT val, FLOAT minval, FLOAT maxval)
 void EAX3_Set(ALuint effect, const EAXLISTENERPROPERTIES *props)
 {
 	alEffecti (effect, AL_EFFECT_TYPE,                     AL_EFFECT_EAXREVERB);
-    alEffectf (effect, AL_EAXREVERB_DENSITY,               clampF(powf(props->flEnvironmentSize, 3.0f) / 16.0f, 0.0f, 1.0f));
-    alEffectf (effect, AL_EAXREVERB_DIFFUSION,             props->flEnvironmentDiffusion);
-    alEffectf (effect, AL_EAXREVERB_GAIN,                  mB_to_gain((float)props->lRoom));
-    alEffectf (effect, AL_EAXREVERB_GAINHF,                mB_to_gain((float)props->lRoomHF));
-    alEffectf (effect, AL_EAXREVERB_GAINLF,                mB_to_gain((float)props->lRoomLF));
-    alEffectf (effect, AL_EAXREVERB_DECAY_TIME,            props->flDecayTime);
-    alEffectf (effect, AL_EAXREVERB_DECAY_HFRATIO,         props->flDecayHFRatio);
-    alEffectf (effect, AL_EAXREVERB_DECAY_LFRATIO,         props->flDecayLFRatio);
-    alEffectf (effect, AL_EAXREVERB_REFLECTIONS_GAIN,      clampF(mB_to_gain((float)props->lReflections), AL_EAXREVERB_MIN_REFLECTIONS_GAIN, AL_EAXREVERB_MAX_REFLECTIONS_GAIN));
-    alEffectf (effect, AL_EAXREVERB_REFLECTIONS_DELAY,     props->flReflectionsDelay);
-    alEffectfv(effect, AL_EAXREVERB_REFLECTIONS_PAN,       &props->vReflectionsPan.x);
-    alEffectf (effect, AL_EAXREVERB_LATE_REVERB_GAIN,      clampF(mB_to_gain((float)props->lReverb), AL_EAXREVERB_MIN_LATE_REVERB_GAIN, AL_EAXREVERB_MAX_LATE_REVERB_GAIN));
-    alEffectf (effect, AL_EAXREVERB_LATE_REVERB_DELAY,     props->flReverbDelay);
-    alEffectfv(effect, AL_EAXREVERB_LATE_REVERB_PAN,       &props->vReverbPan.x);
-    alEffectf (effect, AL_EAXREVERB_ECHO_TIME,             props->flEchoTime);
-    alEffectf (effect, AL_EAXREVERB_ECHO_DEPTH,            props->flEchoDepth);
-    alEffectf (effect, AL_EAXREVERB_MODULATION_TIME,       props->flModulationTime);
-    alEffectf (effect, AL_EAXREVERB_MODULATION_DEPTH,      props->flModulationDepth);
-    alEffectf (effect, AL_EAXREVERB_AIR_ABSORPTION_GAINHF, clampF(mB_to_gain(props->flAirAbsorptionHF), AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF, AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF));
-    alEffectf (effect, AL_EAXREVERB_HFREFERENCE,           props->flHFReference);
-    alEffectf (effect, AL_EAXREVERB_LFREFERENCE,           props->flLFReference);
-    alEffectf (effect, AL_EAXREVERB_ROOM_ROLLOFF_FACTOR,   props->flRoomRolloffFactor);
-    alEffecti (effect, AL_EAXREVERB_DECAY_HFLIMIT,         (props->ulFlags&EAXLISTENERFLAGS_DECAYHFLIMIT) ? AL_TRUE : AL_FALSE);
+	alEffectf (effect, AL_EAXREVERB_DENSITY,               clampF(powf(props->flEnvironmentSize, 3.0f) / 16.0f, 0.0f, 1.0f));
+	alEffectf (effect, AL_EAXREVERB_DIFFUSION,             props->flEnvironmentDiffusion);
+	alEffectf (effect, AL_EAXREVERB_GAIN,                  mB_to_gain((float)props->lRoom));
+	alEffectf (effect, AL_EAXREVERB_GAINHF,                mB_to_gain((float)props->lRoomHF));
+	alEffectf (effect, AL_EAXREVERB_GAINLF,                mB_to_gain((float)props->lRoomLF));
+	alEffectf (effect, AL_EAXREVERB_DECAY_TIME,            props->flDecayTime);
+	alEffectf (effect, AL_EAXREVERB_DECAY_HFRATIO,         props->flDecayHFRatio);
+	alEffectf (effect, AL_EAXREVERB_DECAY_LFRATIO,         props->flDecayLFRatio);
+	alEffectf (effect, AL_EAXREVERB_REFLECTIONS_GAIN,      clampF(mB_to_gain((float)props->lReflections), AL_EAXREVERB_MIN_REFLECTIONS_GAIN, AL_EAXREVERB_MAX_REFLECTIONS_GAIN));
+	alEffectf (effect, AL_EAXREVERB_REFLECTIONS_DELAY,     props->flReflectionsDelay);
+	alEffectfv(effect, AL_EAXREVERB_REFLECTIONS_PAN,       &props->vReflectionsPan.x);
+	alEffectf (effect, AL_EAXREVERB_LATE_REVERB_GAIN,      clampF(mB_to_gain((float)props->lReverb), AL_EAXREVERB_MIN_LATE_REVERB_GAIN, AL_EAXREVERB_MAX_LATE_REVERB_GAIN));
+	alEffectf (effect, AL_EAXREVERB_LATE_REVERB_DELAY,     props->flReverbDelay);
+	alEffectfv(effect, AL_EAXREVERB_LATE_REVERB_PAN,       &props->vReverbPan.x);
+	alEffectf (effect, AL_EAXREVERB_ECHO_TIME,             props->flEchoTime);
+	alEffectf (effect, AL_EAXREVERB_ECHO_DEPTH,            props->flEchoDepth);
+	alEffectf (effect, AL_EAXREVERB_MODULATION_TIME,       props->flModulationTime);
+	alEffectf (effect, AL_EAXREVERB_MODULATION_DEPTH,      props->flModulationDepth);
+	alEffectf (effect, AL_EAXREVERB_AIR_ABSORPTION_GAINHF, clampF(mB_to_gain(props->flAirAbsorptionHF), AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF, AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF));
+	alEffectf (effect, AL_EAXREVERB_HFREFERENCE,           props->flHFReference);
+	alEffectf (effect, AL_EAXREVERB_LFREFERENCE,           props->flLFReference);
+	alEffectf (effect, AL_EAXREVERB_ROOM_ROLLOFF_FACTOR,   props->flRoomRolloffFactor);
+	alEffecti (effect, AL_EAXREVERB_DECAY_HFLIMIT,         (props->ulFlags&EAXLISTENERFLAGS_DECAYHFLIMIT) ? AL_TRUE : AL_FALSE);
 }
 
 void EFX_Set(ALuint effect, const EAXLISTENERPROPERTIES *props)
 {
 	alEffecti(effect, AL_EFFECT_TYPE, AL_EFFECT_REVERB);
-
+	
 	alEffectf(effect, AL_REVERB_DENSITY,               clampF(powf(props->flEnvironmentSize, 3.0f) / 16.0f, 0.0f, 1.0f));
 	alEffectf(effect, AL_REVERB_DIFFUSION,             props->flEnvironmentDiffusion);
 	alEffectf(effect, AL_REVERB_GAIN,                  mB_to_gain((float)props->lRoom));
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 3eb296ae..a73bc2bd 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -26,11 +26,11 @@
 #include "Frontend.h"
 #include "Timer.h"
 
-//todo max channals
-//todo queue
-//todo loop count
-//todo mp3/wav stream
-//todo mp3 player
+//TODO: fix eax3 reverb
+//TODO: max channals
+//TODO: loop count
+//TODO: mp3/wav stream
+//TODO: mp3 player
 
 #pragma comment( lib, "OpenAL32.lib" )
 
diff --git a/src/core/config.h b/src/core/config.h
index 23fe9993..6896a7ba 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -193,8 +193,8 @@ enum Config {
 #define DEFAULT_NATIVE_RESOLUTION	// Set default video mode to your native resolution (fixes Windows 10 launch) 
 #define USE_TXD_CDIMAGE		// generate and load textures from txd.img
 //#define USE_TEXTURE_POOL
-#define AUDIO_OAL
-//#define AUDIO_MSS
+//#define AUDIO_OAL
+#define AUDIO_MSS
 
 // Particle
 //#define PC_PARTICLE
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 20e5c49c..288788c0 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -1773,12 +1773,13 @@ WinMain(HINSTANCE instance,
 	StaticPatcher::Apply();
 	SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
 
-
+/*
 	// TODO: make this an option somewhere
 	AllocConsole();
 	freopen("CONIN$", "r", stdin);
 	freopen("CONOUT$", "w", stdout);
 	freopen("CONOUT$", "w", stderr);
+*/
 
 	/* 
 	 * Initialize the platform independent data.