X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=e820719ad9886b1ea9bc24f608a5b7164dc0dfff;hb=69ec0335692c5e18ca09c091df5a75f022f503f7;hp=aaf7998abd5277c7dd6a11a43be76541b9ee00ef;hpb=9f88e49643566b03fbd6e92509bb66fd42bc1daa;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index aaf7998a..e820719a 100644
--- 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"
-	"  -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"
@@ -5718,6 +5717,14 @@ static void InitProgramConfig(char *command_filename)
   userdata_subdir = USERDATA_DIRECTORY_OTHER;
 #endif
 
+  // set default window size (only relevant on program startup)
+  if (setup.internal.default_window_width  != 0 &&
+      setup.internal.default_window_height != 0)
+  {
+    WIN_XSIZE = setup.internal.default_window_width;
+    WIN_YSIZE = setup.internal.default_window_height;
+  }
+
   InitProgramInfo(command_filename,
 		  config_filename,
 		  userdata_subdir,