removed unused (obsolete) option to specify X11 server display

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index ff86123df0eb47d240a8c19997724dd73a99b28c..297d5dce7870e747d9c05666f4528d7631c2ceb6 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -939,7 +939,6 @@ void GetOptions(int argc, char *argv[],
     rw_base_path = getProgramMainDataPath();
 
   /* initialize global program options */
     rw_base_path = getProgramMainDataPath();
 
   /* initialize global program options */

-  options.display_name = NULL;

   options.server_host = NULL;
   options.server_port = 0;
 
   options.server_host = NULL;
   options.server_port = 0;
 


@@ -1010,15 +1009,6 @@ void GetOptions(int argc, char *argv[],
 
       exit(0);
     }
 
       exit(0);
     }

-    else if (strncmp(option, "-display", option_len) == 0)
-    {
-      if (option_arg == NULL)
-       Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str);
-
-      options.display_name = option_arg;
-      if (option_arg == next_option)
-       options_left++;
-    }

     else if (strncmp(option, "-basepath", option_len) == 0)
     {
       if (option_arg == NULL)
     else if (strncmp(option, "-basepath", option_len) == 0)
     {
       if (option_arg == NULL)

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 98aa9c734422c31ac6b867feab2dc92539e49ccb..11e28ad6f93e28c250d4d32e42e55d5bc1a16106 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -709,7 +709,6 @@ struct ProgramInfo
 
 struct OptionInfo
 {
 
 struct OptionInfo
 {

-  char *display_name;

   char *server_host;
   int server_port;
 
   char *server_host;
   int server_port;
 

diff --git a/src/main.c b/src/main.c
index 213ba4a0122978a96599f44b5c075151e758b7c9..e820719ad9886b1ea9bc24f608a5b7164dc0dfff 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -5605,7 +5605,6 @@ static void print_usage()
        "Usage: %s [OPTION]... [HOSTNAME [PORT]]\n"
        "\n"
        "Options:\n"
        "Usage: %s [OPTION]... [HOSTNAME [PORT]]\n"
        "\n"
        "Options:\n"

-       "  -d, --display HOSTNAME[:SCREEN]  specify X server display\n"

        "  -b, --basepath DIRECTORY         alternative base DIRECTORY\n"
        "  -l, --level DIRECTORY            alternative level DIRECTORY\n"
        "  -g, --graphics DIRECTORY         alternative graphics DIRECTORY\n"
        "  -b, --basepath DIRECTORY         alternative base DIRECTORY\n"
        "  -l, --level DIRECTORY            alternative level DIRECTORY\n"
        "  -g, --graphics DIRECTORY         alternative graphics DIRECTORY\n"