zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Don't start the MAPINFO music just to have it replaced by the saved music when returning to a level in a hub.

Browse source 
SVN r4175 (trunk)
This commit is contained in:
Randy Heit 2013-03-08 02:34:26 +00:00
parent 478bfa6cf1
commit ba0e0c2914
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/s_sound.cpp
View file

@ -446,8 +446,9 @@ void S_Start ()
// start new music for the level // start new music for the level
MusicPaused = false; MusicPaused = false;
// [RH] This is a lot simpler now. // Don't start the music if loading a savegame, because the music is stored there.
if (!savegamerestore) // Don't start the music if revisiting a level in a hub for the same reason.
if (!savegamerestore && (level.info->snapshot == NULL || !level.info->isValid()))
{ {
if (level.cdtrack == 0 || !S_ChangeCDMusic (level.cdtrack, level.cdid)) if (level.cdtrack == 0 || !S_ChangeCDMusic (level.cdtrack, level.cdid))
S_ChangeMusic (level.Music, level.musicorder); S_ChangeMusic (level.Music, level.musicorder);