Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/command.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/economy.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/misc_gui.cpp
#	src/newgrf_config.cpp
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/table/settings/gui_settings.ini
This commit is contained in:
Jonathan G Rennison
2022-05-15 13:54:13 +01:00
121 changed files with 2287 additions and 1592 deletions

View File

@@ -665,6 +665,10 @@ compatible_grf:
return res;
}
/** Set this flag to prevent any NewGRF scanning from being done. */
int _skip_all_newgrf_scanning = 0;
/** Helper for scanning for files with GRF as extension */
class GRFFileScanner : FileScanner {
std::chrono::steady_clock::time_point next_update; ///< The next moment we do update the screen.
@@ -682,6 +686,11 @@ public:
/** Do the scan for GRFs. */
static uint DoScan()
{
if (_skip_all_newgrf_scanning > 0) {
if (_skip_all_newgrf_scanning == 1) _skip_all_newgrf_scanning = 0;
return 0;
}
CalcGRFMD5ThreadingStart();
GRFFileScanner fs;
fs.grfs.clear();