X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Fmain.c;h=13cab898ed95bf930dccaa0c2d8e8b1949b29bfa;hb=7f33353a6e8ce4dc9a3b7a604a4c7deb836544f7;hp=1cf3c9e6162e9fd429edf1440630a2cab189fa64;hpb=c425ce2cafa1ca6b07149dbff0919a9f0de8e21c;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 1cf3c9e6..13cab898 100644
--- 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",
@@ -6772,6 +6772,16 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "mm_pacman",
     "pac man (eating down)"
   },
+  {
+    "mm_bomb.active",
+    "mm_bomb",
+    "active bomb (MM style)"
+  },
+  {
+    "df_mine.active",
+    "df_mine",
+    "active mine"
+  },
 
   // --------------------------------------------------------------------------
   // "unreal" (and therefore not drawable) runtime elements
@@ -7022,56 +7032,6 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "-",
     "-"
   },
-  {
-    "mm_mask_mcduffin.right",
-    "-",
-    "-"
-  },
-  {
-    "mm_mask_mcduffin.up",
-    "-",
-    "-"
-  },
-  {
-    "mm_mask_mcduffin.left",
-    "-",
-    "-"
-  },
-  {
-    "mm_mask_mcduffin.down",
-    "-",
-    "-"
-  },
-  {
-    "mm_mask_grid_1",
-    "-",
-    "-"
-  },
-  {
-    "mm_mask_grid_2",
-    "-",
-    "-"
-  },
-  {
-    "mm_mask_grid_3",
-    "-",
-    "-"
-  },
-  {
-    "mm_mask_grid_4",
-    "-",
-    "-"
-  },
-  {
-    "mm_mask_rectangle",
-    "-",
-    "-"
-  },
-  {
-    "mm_mask_circle",
-    "-",
-    "-"
-  },
   {
     "[default]",
     "default",
@@ -7710,10 +7670,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 +7792,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);