dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# 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
This commit is contained in:
Jonathan G Rennison
2024-06-10 22:38:15 +01:00
parent 79fe829e98 a1b03ee69e
commit c67f14dc88
26 changed files with 175 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/openttd.cpp
View File

@@ -756,11 +756,10 @@ static std::vector<OptionData> CreateOptions()
/**
* Main entry point for this lovely game.
* @param argc The number of arguments passed to this game.
* @param argv The values of the arguments.
* @param arguments The command line arguments passed to the application.
* @return 0 when there is no error.
*/
int openttd_main(int argc, char *argv[])
int openttd_main(std::span<char * const> arguments)
{
SetSelfAsMainThread();
PerThreadSetup();
@@ -788,7 +787,7 @@ int openttd_main(int argc, char *argv[])
_switch_mode = SM_MENU;
auto options = CreateOptions();
GetOptData mgo(std::span(argv + 1, argc - 1), options);
GetOptData mgo(arguments.subspan(1), options);
int ret = 0;
int i;
@@ -878,7 +877,7 @@ int openttd_main(int argc, char *argv[])
break;
case 'q':
case 'K': {
DeterminePaths(argv[0], only_local_path);
DeterminePaths(arguments[0], only_local_path);
if (StrEmpty(mgo.opt)) {
ret = 1;
return ret;
@@ -941,7 +940,7 @@ int openttd_main(int argc, char *argv[])
*
* The next two functions are needed to list the graphics sets. We can't do them earlier
* because then we cannot show it on the debug console as that hasn't been configured yet. */
DeterminePaths(argv[0], only_local_path);
DeterminePaths(arguments[0], only_local_path);
TarScanner::DoScan(TarScanner::BASESET);
BaseGraphics::FindSets();
BaseSounds::FindSets();
@@ -950,7 +949,7 @@ int openttd_main(int argc, char *argv[])
return ret;
}
DeterminePaths(argv[0], only_local_path);
DeterminePaths(arguments[0], only_local_path);
TarScanner::DoScan(TarScanner::BASESET);
if (dedicated) DEBUG(net, 3, "Starting dedicated server, version %s", _openttd_revision);