Merge branch 'master' into jgrpp

# Conflicts:
#	src/fileio.cpp
#	src/fileio_func.h
#	src/industry_cmd.cpp
#	src/ini.cpp
#	src/openttd.cpp
#	src/os/windows/win32_main.cpp
#	src/settingsgen/settingsgen.cpp
#	src/strgen/strgen.cpp
#	src/strings.cpp

src/openttd.h

@@ -96,7 +96,7 @@ extern uint32_t _pause_countdown;
 void AskExitGame();
 void AskExitToGameMenu();
 
-int openttd_main(int argc, char *argv[]);
+int openttd_main(std::span<char * const> arguments);
 void StateGameLoop();
 void HandleExitGameRequest();
 void InitMusicDriver(bool init_volume);