renamed "kettles" to "cauldrons"

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 1cf3c9e6162e9fd429edf1440630a2cab189fa64..b4369b74127571d7d943ddb08dda6deccbd1d058 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4664,7 +4664,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "mm_kettle",
     "mm_kettle",
-    "magic kettle"
+    "magic cauldron"
   },
   {
     "mm_bomb",
@@ -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"
@@ -7831,7 +7832,7 @@ 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) || defined(PLATFORM_EMSCRIPTEN)
+#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MAC) || defined(PLATFORM_EMSCRIPTEN)
   userdata_subdir = program_title;
 #elif defined(PLATFORM_UNIX)
   userdata_subdir = getStringCat2(".", userdata_basename);