Exit with error when invalid server type is passed on CLI

Also made it exit with error when there is an unknown option or missing
argument.

1 files changed, 14 insertions, 9 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 6244b946..b44f4d3a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -118,6 +118,8 @@ static void parseOptions(int argc, char *argv[], Client::Options &options)
                 break;
             case '?': // Unknown option
             case ':': // Missing argument
+                options.exitWithError = true;
+                [[fallthrough]];
             case 'h':
                 options.printHelp = true;
                 break;
@@ -158,7 +160,12 @@ static void parseOptions(int argc, char *argv[], Client::Options &options)
                 options.screenshotDir = optarg;
                 break;
             case 'y':
-                options.serverType = optarg;
+                options.serverType = ServerInfo::parseType(optarg);
+                if (options.serverType == ServerType::UNKNOWN)
+                {
+                    std::cerr << _("Invalid server type, expected one of: tmwathena, manaserv") << std::endl;
+                    options.exitWithError = true;
+                }
                 break;
         }
     }
@@ -203,16 +210,14 @@ int main(int argc, char *argv[])
     Client::Options options;
     parseOptions(argc, argv, options);
 
+    if (options.printVersion)
+        printVersion();
+
     if (options.printHelp)
-    {
         printHelp();
-        return 0;
-    }
-    else if (options.printVersion)
-    {
-        printVersion();
-        return 0;
-    }
+
+    if (options.printHelp || options.printVersion || options.exitWithError)
+        return options.exitWithError ? 1 : 0;
 
     initInternationalization();