Skip to content

Commit 870f1af

Browse files
committed
Lowering volume mix of music
1 parent 5fb7ce7 commit 870f1af

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/MacSrc/Prefs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void SetDefaultPrefs(void) {
7878

7979
gShockPrefs.soBackMusic = true;
8080
gShockPrefs.soSoundFX = true;
81-
gShockPrefs.soMusicVolume = 100;
81+
gShockPrefs.soMusicVolume = 75;
8282
gShockPrefs.soSfxVolume = 100;
8383
gShockPrefs.soAudioLogVolume = 100;
8484

src/MacSrc/SDLSound.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ void snd_sample_reload_parms(snd_digi_parms *sdp) {
126126

127127
void MacTuneUpdateVolume(void) {
128128
extern uchar curr_vol_lev;
129-
Mix_VolumeMusic((curr_vol_lev * curr_vol_lev) * 128 / 10000);
129+
float music_vol_mod = 0.6f;
130+
Mix_VolumeMusic(((curr_vol_lev * curr_vol_lev) * 128 / 10000) * music_vol_mod);
130131
}
131132

132133
int MacTuneLoadTheme(char* theme_base, int themeID) {
@@ -153,7 +154,7 @@ int MacTuneLoadTheme(char* theme_base, int themeID) {
153154
}
154155

155156
void MacTuneKillCurrentTheme(void) {
156-
Mix_FadeOutMusic(300);
157+
Mix_HaltMusic();
157158
}
158159

159160
#else

0 commit comments

Comments
 (0)