Merge branch 'master' into jgrpp

2021-04-05 17:50:39 +01:00
parent 297b340697 9bfa7198fd
commit 5e14b54a0c
164 changed files with 3493 additions and 2443 deletions
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -113,4 +113,6 @@ void HandleExitGameRequest();

 void SwitchToMode(SwitchMode new_mode);

+void RequestNewGRFScan(struct NewGRFScanCallback *callback = nullptr);
+
 #endif /* OPENTTD_H */