Merge branch 'master' into jgrpp

# Conflicts: # src/lang/french.txt # src/network/network_udp.cpp
2021-04-12 22:59:30 +01:00
parent 76981ca8cd 433602b072
commit 253d54ce05
23 changed files with 174 additions and 81 deletions
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -113,6 +113,6 @@ void HandleExitGameRequest();

 void SwitchToMode(SwitchMode new_mode);

-void RequestNewGRFScan(struct NewGRFScanCallback *callback = nullptr);
+bool RequestNewGRFScan(struct NewGRFScanCallback *callback = nullptr);

 #endif /* OPENTTD_H */