Merge branch 'master' into jgrpp

# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/commit-checker.yml # src/openttd.cpp
2020-12-27 20:16:16 +00:00
parent aefefb61c2 b7851e51ad
commit 483ed2f468
80 changed files with 331 additions and 711 deletions
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -57,6 +57,7 @@ extern GameMode _game_mode;
 extern SwitchMode _switch_mode;
 extern bool _check_special_modes;
 extern bool _exit_game;
+extern bool _save_config;

 /** Modes of pausing we've got */
 enum PauseMode : byte {