From 3ad2b7f03985bd97a32b557c987c5ffb3a4dad76 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Mon, 20 Aug 2018 01:16:52 -0400 Subject: [PATCH] Rename I_QueueDigSongPostFade to I_QueueDigSong --- src/i_sound.h | 2 +- src/s_sound.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i_sound.h b/src/i_sound.h index 3c8a2ca62..43b8eb4cc 100644 --- a/src/i_sound.h +++ b/src/i_sound.h @@ -258,7 +258,7 @@ boolean I_FadeMusic(UINT8 target_volume, UINT32 ms); boolean I_FadeOutStopMusic(UINT32 ms); boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean looping, UINT32 position, UINT32 fadeinms, boolean queuepostfade); -#define I_QueueDigSongPostFade(a,b,c,d,e) I_FadeInStartDigSong(a,b,c,d,e,1) +#define I_QueueDigSong(a,b,c,d,e) I_FadeInStartDigSong(a,b,c,d,e,1) /** \brief The I_StartDigSong function diff --git a/src/s_sound.c b/src/s_sound.c index abc9ee95d..340d6a1d3 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1408,7 +1408,7 @@ void S_ChangeMusicWithFade(const char *mmusic, UINT16 mflags, boolean looping, U if (prefadems && I_MusicType() != MU_MID) //have to queue post-fade // allow even if the music is the same { I_FadeOutStopMusic(prefadems); - I_QueueDigSongPostFade(newmusic, mflags & MUSIC_TRACKMASK, looping, position, fadeinms); + I_QueueDigSong(newmusic, mflags & MUSIC_TRACKMASK, looping, position, fadeinms); // HACK: set the vars now and hope everything works out strncpy(music_name, newmusic, 7);