From ba0e0c2914c0b76d4b2e5edf744ba8e949b5cf9a Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 8 Mar 2013 02:34:26 +0000 Subject: [PATCH] - Fixed: Don't start the MAPINFO music just to have it replaced by the saved music when returning to a level in a hub. SVN r4175 (trunk) --- src/s_sound.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/s_sound.cpp b/src/s_sound.cpp index 2f0c3e44a..175ea7749 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -446,8 +446,9 @@ void S_Start () // start new music for the level MusicPaused = false; - // [RH] This is a lot simpler now. - if (!savegamerestore) + // Don't start the music if loading a savegame, because the music is stored there. + // 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)) S_ChangeMusic (level.Music, level.musicorder);