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

Fix #13307: Return non-zero value when there is a mistake in command-line arguments 

Specifically, when the savegame passed to -q cannot be read or when non-existent/invalid options are passed
pull/13547/head
merni-ns 2025-02-13 23:26:22 +05:30
parent b2c5712319
commit cf9c6fcc57
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<char * const> arguments)
SetDParamStr(0, _load_check_data.error_msg); SetDParamStr(0, _load_check_data.error_msg);
fmt::print(stderr, "{}\n", GetString(_load_check_data.error)); fmt::print(stderr, "{}\n", GetString(_load_check_data.error));
} }
ret = 1;
return ret; return ret;
} }
@ -640,14 +641,12 @@ int openttd_main(std::span<char * const> 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.
* *
@ -659,6 +658,7 @@ int openttd_main(std::span<char * const> arguments)
BaseSounds::FindSets(); BaseSounds::FindSets();
BaseMusic::FindSets(); BaseMusic::FindSets();
ShowHelp(); ShowHelp();
if (i != 'h') ret = 1;
return ret; return ret;
} }