Skip to content
Snippets Groups Projects
Commit a4fade9b authored by Marco Z's avatar Marco Z
Browse files

Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt

parents 7cc0b6cf 2644180b
No related branches found
No related tags found
1 merge request!494libopenmpt library support
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
src/s_sound.c
+ 1
− 1
View file @ a4fade9b
...@@ -1607,7 +1607,7 @@ boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 m ...@@ -1607,7 +1607,7 @@ boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 m
if (source_volume < 0) if (source_volume < 0)
return I_FadeSong(target_volume, ms, NULL); return I_FadeSong(target_volume, ms, NULL);
else else
return I_FadeSongFromVolume(target_volume, source_volume, ms, false); return I_FadeSongFromVolume(target_volume, source_volume, ms, NULL);
} }
boolean S_FadeOutStopMusic(UINT32 ms) boolean S_FadeOutStopMusic(UINT32 ms)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment