mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not pause the game during save/load prompt in networked mode

This commit is contained in:
Matt 2019-08-06 17:59:17 +02:00
parent 2fd91fd8ef
commit aaeb64888f
No known key found for this signature in database
GPG Key ID: 6D4C24A61C93E208
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/openrct2-ui/windows/SavePrompt.cpp
View File

@ -16,6 +16,7 @@
#include <openrct2/audio/audio.h>
#include <openrct2/config/Config.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/network/network.h>
#include <openrct2/scenario/Scenario.h>
#include <openrct2/windows/Intent.h>
@ -134,7 +135,7 @@ rct_window* window_save_prompt_open()
* and game_load_or_quit() are not called by the original binary anymore.
*/
if (gScreenAge < 3840)
if (gScreenAge < 3840 && network_get_mode() == NETWORK_MODE_NONE)
{
game_load_or_quit_no_save_prompt();
return nullptr;
@ -175,9 +176,13 @@ rct_window* window_save_prompt_open()
window->enabled_widgets = enabled_widgets;
window_init_scroll_widgets(window);
// Pause the game
gGamePaused |= GAME_PAUSED_MODAL;
audio_stop_all_music_and_sounds();
// Pause the game if not network play.
if (network_get_mode() == NETWORK_MODE_NONE)
{
gGamePaused |= GAME_PAUSED_MODAL;
audio_stop_all_music_and_sounds();
}
window_invalidate_by_class(WC_TOP_TOOLBAR);
stringId = window_save_prompt_labels[prompt_mode][0];
@ -198,8 +203,12 @@ rct_window* window_save_prompt_open()
static void window_save_prompt_close(rct_window* w)
{
// Unpause the game
gGamePaused &= ~GAME_PAUSED_MODAL;
audio_unpause_sounds();
if (network_get_mode() == NETWORK_MODE_NONE)
{
gGamePaused &= ~GAME_PAUSED_MODAL;
audio_unpause_sounds();
}
window_invalidate_by_class(WC_TOP_TOOLBAR);
}