lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename I_QueueDigSongPostFade to I_QueueDigSong

This commit is contained in:
mazmazz 2018-08-20 01:16:52 -04:00
parent 9539c597dd
commit 18daf255ee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i_sound.h
View File

@ -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

2
src/s_sound.c
View File

@ -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);