dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/french.txt
#	src/network/network_udp.cpp
This commit is contained in:
Jonathan G Rennison
2021-04-12 22:59:30 +01:00
parent 76981ca8cd 433602b072
commit 253d54ce05
23 changed files with 174 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/network_internal.h
View File

@@ -130,11 +130,6 @@ extern uint32 _network_join_bytes_total;
extern uint8 _network_reconnect;
extern bool _network_udp_server;
extern uint16 _network_udp_broadcast;
extern uint8 _network_advertise_retries;
extern CompanyMask _network_company_passworded;
void NetworkTCPQueryServer(NetworkAddress address);