Lowering volume mix of music

Interrupt · Aug 3, 2018 · 870f1af · 870f1af
1 parent 5fb7ce7
commit 870f1af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/MacSrc/Prefs.c b/src/MacSrc/Prefs.c
@@ -78,7 +78,7 @@ void SetDefaultPrefs(void) {
 
     gShockPrefs.soBackMusic = true;
     gShockPrefs.soSoundFX = true;
-    gShockPrefs.soMusicVolume = 100;
+    gShockPrefs.soMusicVolume = 75;
     gShockPrefs.soSfxVolume = 100;
     gShockPrefs.soAudioLogVolume = 100;
 

diff --git a/src/MacSrc/SDLSound.c b/src/MacSrc/SDLSound.c
@@ -126,7 +126,8 @@ void snd_sample_reload_parms(snd_digi_parms *sdp) {
 
 void MacTuneUpdateVolume(void) {
 	extern uchar curr_vol_lev;
-	Mix_VolumeMusic((curr_vol_lev * curr_vol_lev) * 128 / 10000);
+	float music_vol_mod = 0.6f;
+	Mix_VolumeMusic(((curr_vol_lev * curr_vol_lev) * 128 / 10000) * music_vol_mod);
 }
 
 int MacTuneLoadTheme(char* theme_base, int themeID) {
@@ -153,7 +154,7 @@ int MacTuneLoadTheme(char* theme_base, int themeID) {
 }
 
 void MacTuneKillCurrentTheme(void) {
-	Mix_FadeOutMusic(300);
+	Mix_HaltMusic();
 }
 
 #else