mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Merge cf9c6fcc57 into bd2430dc94

merni-ns 2025-06-26 07:33:45 +00:00 committed by GitHub
parent bd2430dc94 cf9c6fcc57
commit bfc6ae194d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openttd.cpp
View File

@ -625,6 +625,7 @@ int openttd_main(std::span<std::string_view> arguments)
InitializeLanguagePacks(); // A language pack is needed for GetString() InitializeLanguagePacks(); // A language pack is needed for GetString()
fmt::print(stderr, "{}\n", GetString(_load_check_data.error, _load_check_data.error_msg)); fmt::print(stderr, "{}\n", GetString(_load_check_data.error, _load_check_data.error_msg));
} }
ret = 1;
return ret; return ret;
} }
@ -646,14 +647,12 @@ int openttd_main(std::span<std::string_view> arguments)
case 'c': _config_file = mgo.opt; break; case 'c': _config_file = mgo.opt; break;
case 'x': scanner->save_config = false; break; case 'x': scanner->save_config = false; break;
case 'X': only_local_path = true; break; case 'X': only_local_path = true; break;
case 'h': case 'h': break; // handled below
i = -2; // Force printing of help.
break;
} }
if (i == -2) break; if (i == 'h' || i == -2) break;
} }
if (i == -2 || !mgo.arguments.empty()) { if (i == 'h' || i == -2 || !mgo.arguments.empty()) {
/* Either the user typed '-h', they made an error, or they added unrecognized command line arguments. /* Either the user typed '-h', they made an error, or they added unrecognized command line arguments.
* In all cases, print the help, and exit. * In all cases, print the help, and exit.
* *
@ -665,6 +664,7 @@ int openttd_main(std::span<std::string_view> arguments)
BaseSounds::FindSets(); BaseSounds::FindSets();
BaseMusic::FindSets(); BaseMusic::FindSets();
ShowHelp(); ShowHelp();
if (i != 'h') ret = 1;
return ret; return ret;
} }