diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 184ae69bbf..a0636e15d9 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -654,12 +654,12 @@ namespace OpenRCT2 bool sendMap = false; if (info.Type == FILE_TYPE::SAVED_GAME) { - if (network_get_mode() == NETWORK_MODE_CLIENT) + if (_network.GetMode() == NETWORK_MODE_CLIENT) { - network_close(); + _network.Close(); } game_load_init(); - if (network_get_mode() == NETWORK_MODE_SERVER) + if (_network.GetMode() == NETWORK_MODE_SERVER) { sendMap = true; } @@ -667,13 +667,13 @@ namespace OpenRCT2 else { scenario_begin(); - if (network_get_mode() == NETWORK_MODE_SERVER) + if (_network.GetMode() == NETWORK_MODE_SERVER) { sendMap = true; } - if (network_get_mode() == NETWORK_MODE_CLIENT) + if (_network.GetMode() == NETWORK_MODE_CLIENT) { - network_close(); + _network.Close(); } } // This ensures that the newly loaded save reflects the user's @@ -681,10 +681,10 @@ namespace OpenRCT2 peep_update_names(gConfigGeneral.show_real_names_of_guests); if (sendMap) { - network_send_map(); + _network.Server_Send_MAP(); } #ifdef USE_BREAKPAD - if (network_get_mode() == NETWORK_MODE_NONE) + if (_network.GetMode() == NETWORK_MODE_NONE) { start_silent_record(); } @@ -884,13 +884,13 @@ namespace OpenRCT2 if (String::IsNullOrEmpty(gCustomPassword)) { - network_set_password(gConfigNetwork.default_password.c_str()); + _network.SetPassword(gConfigNetwork.default_password.c_str()); } else { - network_set_password(gCustomPassword); + _network.SetPassword(gCustomPassword); } - network_begin_server(gNetworkStartPort, gNetworkStartAddress); + _network.BeginServer(gNetworkStartPort, gNetworkStartAddress); } else #endif // DISABLE_NETWORK @@ -920,7 +920,7 @@ namespace OpenRCT2 { gNetworkStartPort = gConfigNetwork.default_port; } - network_begin_client(gNetworkStartHost, gNetworkStartPort); + _network.BeginClient(gNetworkStartHost, gNetworkStartPort); } #endif // DISABLE_NETWORK