X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=e03681c799198310d4c85d8cfc148deafb5311b7;hb=4867b769fb4ce52d71200bb147bfa511cb84cc9c;hp=7ebbee1fbe199c0d917d071dd0c37262af7e1a26;hpb=368684d4c5e2a59cbea8c5e35171f3fe008b844f;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 7ebbee1f..e03681c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7710,10 +7710,11 @@ static void print_usage(void)
 	"\n"
 	"Options:\n"
 	"  -b, --basepath DIRECTORY         alternative base DIRECTORY\n"
-	"  -l, --level DIRECTORY            alternative level DIRECTORY\n"
+	"  -l, --levels DIRECTORY           alternative levels DIRECTORY\n"
 	"  -g, --graphics DIRECTORY         alternative graphics DIRECTORY\n"
 	"  -s, --sounds DIRECTORY           alternative sounds DIRECTORY\n"
 	"  -m, --music DIRECTORY            alternative music DIRECTORY\n"
+	"      --display NR                 open program window on display NR\n"
 	"      --mytapes                    use private tapes for tape tests\n"
 	"  -n, --network                    network multiplayer game\n"
 	"      --serveronly                 only start network server\n"
@@ -7799,9 +7800,6 @@ static void InitProgramConfig(char *command_filename)
   char *config_filename = getProgramConfigFilename(command_filename);
   char *userdata_basename = getBaseNameNoSuffix(command_filename);
   char *userdata_subdir;
-#if defined(PLATFORM_UNIX)
-  char *userdata_subdir_unix;
-#endif
 
   // read default program config, if existing
   if (fileExists(config_filename))
@@ -7819,11 +7817,6 @@ static void InitProgramConfig(char *command_filename)
     LoadSetupFromFilename(config_filename);
   }
 
-#if defined(PLATFORM_UNIX)
-  // set user data directory for Linux/Unix (but not Mac OS X)
-  userdata_subdir_unix = getStringCat2(".", userdata_basename);
-#endif
-
   // set program title from potentially redefined program title
   if (setup.internal.program_title != NULL &&
       strlen(setup.internal.program_title) > 0)
@@ -7839,10 +7832,10 @@ static void InitProgramConfig(char *command_filename)
       strlen(setup.internal.program_icon_file) > 0)
     program_icon_file = getStringCopy(setup.internal.program_icon_file);
 
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MAC) || defined(PLATFORM_EMSCRIPTEN)
   userdata_subdir = program_title;
 #elif defined(PLATFORM_UNIX)
-  userdata_subdir = userdata_subdir_unix;
+  userdata_subdir = getStringCat2(".", userdata_basename);
 #else
   userdata_subdir = USERDATA_DIRECTORY_OTHER;
 #endif