Intermission: Don't fade out level music when using win32 midi volume hack
This commit is contained in:
parent
6cf05a4613
commit
6b93ca9221
|
@ -697,7 +697,12 @@ void Y_Ticker(void)
|
||||||
|
|
||||||
if (!intertic) // first time only
|
if (!intertic) // first time only
|
||||||
{
|
{
|
||||||
if (mapheaderinfo[gamemap-1]->musinterfadeout)
|
if (mapheaderinfo[gamemap-1]->musinterfadeout
|
||||||
|
#ifdef _WIN32
|
||||||
|
// can't fade midi due to win32 volume hack
|
||||||
|
&& S_MusicType() != MU_MID
|
||||||
|
#endif
|
||||||
|
)
|
||||||
S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
|
S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
|
||||||
else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
|
else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
|
||||||
S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
|
S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
|
||||||
|
@ -764,7 +769,12 @@ void Y_Ticker(void)
|
||||||
|
|
||||||
if (!intertic) // first time only
|
if (!intertic) // first time only
|
||||||
{
|
{
|
||||||
if (mapheaderinfo[gamemap-1]->musinterfadeout)
|
if (mapheaderinfo[gamemap-1]->musinterfadeout
|
||||||
|
#ifdef _WIN32
|
||||||
|
// can't fade midi due to win32 volume hack
|
||||||
|
&& S_MusicType() != MU_MID
|
||||||
|
#endif
|
||||||
|
)
|
||||||
S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
|
S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
|
||||||
else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
|
else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
|
||||||
S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
|
S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
|
||||||
|
|
Loading…
Reference in New Issue