Merge cf9c6fcc57 into aaf5d39b15

Specifically, when the savegame passed to -q cannot be read or when non-existent/invalid options are passed

src/openttd.cpp

@@ -625,6 +625,7 @@ int openttd_main(std::span<std::string_view> arguments)
 					InitializeLanguagePacks(); // A language pack is needed for GetString()
 					fmt::print(stderr, "{}\n", GetString(_load_check_data.error, _load_check_data.error_msg));
 				}
+				ret = 1;
 				return ret;
 			}
 
@@ -646,14 +647,12 @@ int openttd_main(std::span<std::string_view> arguments)
 		case 'c': _config_file = mgo.opt; break;
 		case 'x': scanner->save_config = false; 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.
 		 * In all cases, print the help, and exit.
 		 *
@@ -665,6 +664,7 @@ int openttd_main(std::span<std::string_view> arguments)
 		BaseSounds::FindSets();
 		BaseMusic::FindSets();
 		ShowHelp();
+		if (i != 'h') ret = 1;
 		return ret;
 	}