X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmisc.c;h=39d1fdc45864f5c8022f6891efdb08ca9a49b51e;hb=5ed4de42ced8e7dce5b786ba3d5fd1a6f6a7d7f6;hp=2d7e7f1f6c106e8ce6971fb2eb9ddacb409d6c8e;hpb=34efaa3925a28cb95ecb05bf2c693c16f6edfe2f;p=rocksndiamonds.git

diff --git a/src/misc.c b/src/misc.c
index 2d7e7f1f..39d1fdc4 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -337,15 +337,15 @@ void GetOptions(char *argv[])
     char *option_arg = NULL;
     int option_len = strlen(option);
 
+    if (option_len >= MAX_OPTION_LEN)
+      Error(ERR_EXIT_HELP, "unrecognized option '%s'", option);
+
     strcpy(option_str, option);			/* copy argument into buffer */
     option = option_str;
 
     if (strcmp(option, "--") == 0)		/* stop scanning arguments */
       break;
 
-    if (option_len >= MAX_OPTION_LEN)
-      Error(ERR_EXIT_HELP, "unrecognized option '%s'", option);
-
     if (strncmp(option, "--", 2) == 0)		/* treat '--' like '-' */
       option++;
 
@@ -384,8 +384,6 @@ void GetOptions(char *argv[])
       options.display_name = option_arg;
       if (option_arg == next_option)
 	options_left++;
-
-      printf("--display == '%s'\n", options.display_name);
     }
     else if (strncmp(option, "-basepath", option_len) == 0)
     {
@@ -396,8 +394,6 @@ void GetOptions(char *argv[])
       if (option_arg == next_option)
 	options_left++;
 
-      printf("--basepath == '%s'\n", options.base_directory);
-
       /* adjust path for level directory accordingly */
       options.level_directory =
 	getPath2(options.base_directory, LEVELS_DIRECTORY);
@@ -410,42 +406,32 @@ void GetOptions(char *argv[])
       options.level_directory = option_arg;
       if (option_arg == next_option)
 	options_left++;
-
-      printf("--levels == '%s'\n", options.level_directory);
     }
     else if (strncmp(option, "-network", option_len) == 0)
     {
-      printf("--network\n");
-
       options.network = TRUE;
     }
     else if (strncmp(option, "-serveronly", option_len) == 0)
     {
-      printf("--serveronly\n");
-
       options.serveronly = TRUE;
     }
     else if (strncmp(option, "-verbose", option_len) == 0)
     {
-      printf("--verbose\n");
-
       options.verbose = TRUE;
     }
     else if (*option == '-')
+    {
       Error(ERR_EXIT_HELP, "unrecognized option '%s'", option_str);
+    }
     else if (options.server_host == NULL)
     {
       options.server_host = *options_left;
-
-      printf("server.name == '%s'\n", options.server_host);
     }
     else if (options.server_port == 0)
     {
       options.server_port = atoi(*options_left);
       if (options.server_port < 1024)
 	Error(ERR_EXIT_HELP, "bad port number '%d'", options.server_port);
-
-      printf("port == %d\n", options.server_port);
     }
     else
       Error(ERR_EXIT_HELP, "too many arguments");
@@ -459,6 +445,10 @@ void Error(int mode, char *format, ...)
   char *process_name = "";
   FILE *error = stderr;
 
+  /* display warnings only when running in verbose mode */
+  if (mode & ERR_WARN && !options.verbose)
+    return;
+
 #ifdef MSDOS
   if ((error = openErrorFile()) == NULL)
   {