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

Fix desync when host changes map

This commit is contained in:
ζeh Matt 2019-05-19 17:44:43 +02:00 committed by Michael Steenbeek
parent 1de25be4fb
commit ee79c11389
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/Context.cpp
View File

@ -545,6 +545,8 @@ namespace OpenRCT2
sprite_position_tween_reset();
gScreenAge = 0;
gLastAutoSaveUpdate = AUTOSAVE_PAUSE;
bool sendMap = false;
if (info.Type == FILE_TYPE::SAVED_GAME)
{
if (network_get_mode() == NETWORK_MODE_CLIENT)
@ -554,7 +556,7 @@ namespace OpenRCT2
game_load_init();
if (network_get_mode() == NETWORK_MODE_SERVER)
{
network_send_map();
sendMap = true;
}
}
else
@ -562,7 +564,7 @@ namespace OpenRCT2
scenario_begin();
if (network_get_mode() == NETWORK_MODE_SERVER)
{
network_send_map();
sendMap = true;
}
if (network_get_mode() == NETWORK_MODE_CLIENT)
{
@ -572,6 +574,10 @@ namespace OpenRCT2
// This ensures that the newly loaded save reflects the user's
// 'show real names of guests' option, now that it's a global setting
peep_update_names(gConfigGeneral.show_real_names_of_guests);
if (sendMap)
{
network_send_map();
}
return true;
}
catch (const ObjectLoadException& e)

2
src/openrct2/network/Network.cpp
View File

@ -33,7 +33,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "33"
#define NETWORK_STREAM_VERSION "34"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;