Fix music stop when loading saved game in title screen #2371
Conversation
| Audio::pauseSound(); | ||
| if (!isTitleMode()) | ||
| { | ||
| Audio::pauseSound(); |
There was a problem hiding this comment.
do we ever want to pause music when the browser window is open? maybe we just remove this entirely?
There was a problem hiding this comment.
In Locomotion music is paused when opening browser window in game. But now I realize that it is paused because the game is paused, not because the window is open. Then yes, I think we can remove it, but we have to pause music when game is paused. This is not working now if I remove Audio::pauseSound(); in this comment.
There was a problem hiding this comment.
I was partially wrong. By removing it, the music is still stopped in PromptSaveWindow::open() while pressing load game, but it is not stopped when pressing saving game.
There was a problem hiding this comment.
I see, this is necessary because of the prompt window appearing and pausing the game before the actual load window does, but the prompt doesn't always show so we need it in both places.
| @@ -130,11 +133,6 @@ namespace OpenLoco::Game | |||
| // 0x0043BFF8 | |||
| void loadGame() | |||
| { | |||
| if (isTitleMode()) | |||
| { | |||
| Title::stop(); | |||
There was a problem hiding this comment.
without this - when does this otherwise get called? it needs to be called somewhere before the save-game is actually loaded
There was a problem hiding this comment.
loadGame() is called again when a game is loaded, and it goes into:
else if (!isNetworked())
{
if (Game::loadSaveGameOpen())
where importSaveToGameState() in the end calls stopMusic().
This fixes #2341.
However something is not clear to me:
loadGame()hadTitle::stop();? Maybe it was added thinking that the function was for loading the selected game and not for opening load game window.PromptSaveWindowand closing it immediately. In fact the code callsUi::WindowManager::close(Ui::WindowType::saveGamePrompt);and then0x0043C577 onClose(). Why is that?