Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # src/industry_cmd.cpp # src/industry_cmd.h # src/network/core/http_curl.cpp # src/network/core/tcp_http.cpp # src/network/core/tcp_http.h # src/network/network_content.h # src/script/api/script_goal.cpp # src/script/api/script_industry.cpp # src/script/api/script_league.cpp # src/script/api/script_story_page.cpp # src/script/api/script_town.cpp # src/train.h # src/train_cmd.cpp
This commit is contained in:
@@ -1356,12 +1356,14 @@ void NetworkStartUp()
|
||||
NetworkUDPInitialize();
|
||||
DEBUG(net, 3, "Network online, multiplayer available");
|
||||
NetworkFindBroadcastIPs(&_broadcast_list);
|
||||
NetworkHTTPInitialize();
|
||||
}
|
||||
|
||||
/** This shuts the network down */
|
||||
void NetworkShutDown()
|
||||
{
|
||||
NetworkDisconnect(true);
|
||||
NetworkHTTPUninitialize();
|
||||
NetworkUDPClose();
|
||||
|
||||
DEBUG(net, 3, "Shutting down network");
|
||||
|
Reference in New Issue
Block a user