XEEN: fix missing music when loading a save from the main menu

This commit is contained in:
Benoit Pierre
2021-12-01 20:53:25 -08:00
committed by Paul Gilbert
parent d393bca837
commit 2ed47004b5
2 changed files with 4 additions and 4 deletions
+2 -4
View File
@@ -901,8 +901,7 @@ void Map::load(int mapId) {
} else {
musName = "outdoors.m";
}
if (musName != sound._currentMusic)
sound.playSong(musName, 207);
sound.playSong(musName, 207);
// Load sprite sets needed for scene rendering
_groundSprites.load("water.out");
@@ -938,8 +937,7 @@ void Map::load(int mapId) {
} else {
musName = Res.MUSIC_FILES1[MUS_INDEXES[_mazeData->_wallKind]];
}
if (musName != sound._currentMusic)
sound.playSong(musName, 207);
sound.playSong(musName, 207);
// Load sprite sets needed for scene rendering
_skySprites[1].load(Common::String::format("%s.sky",
+2
View File
@@ -195,6 +195,8 @@ void Sound::playSong(Common::SeekableReadStream &stream) {
}
void Sound::playSong(const Common::String &name, int param) {
if (isMusicPlaying() && name == _currentMusic)
return;
_currentMusic = name;
Common::File mf;