X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=9e5828d39aa0daac8590ab16c15e029623e9236c;hb=3a606b24c2e6459e8522f060d37f8f4b9434c4b8;hp=13cab898ed95bf930dccaa0c2d8e8b1949b29bfa;hpb=c2575609f053eab9617b11f2150e308904cab339;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 13cab898..9e5828d3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 Bitmap		       *bitmap_db_field;
-Bitmap		       *bitmap_db_panel;
 Bitmap		       *bitmap_db_door_1;
 Bitmap		       *bitmap_db_door_2;
 Bitmap		       *bitmap_db_store_1;
@@ -5297,24 +5296,24 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "extra energy ball (empty)"
   },
   {
-    "mm_unused_156",
-    "unused",
-    "(not used)"
+    "mm_envelope_1",
+    "mm_envelope",
+    "mail envelope 1 (MM style)"
   },
   {
-    "mm_unused_157",
-    "unused",
-    "(not used)"
+    "mm_envelope_2",
+    "mm_envelope",
+    "mail envelope 2 (MM style)"
   },
   {
-    "mm_unused_158",
-    "unused",
-    "(not used)"
+    "mm_envelope_3",
+    "mm_envelope",
+    "mail envelope 3 (MM style)"
   },
   {
-    "mm_unused_159",
-    "unused",
-    "(not used)"
+    "mm_envelope_4",
+    "mm_envelope",
+    "mail envelope 4 (MM style)"
   },
   {
     "df_mirror_1",
@@ -7757,25 +7756,13 @@ static void InitProgramConfig(char *command_filename)
   char *program_title = PROGRAM_TITLE_STRING;
   char *program_icon_file = PROGRAM_ICON_FILENAME;
   char *program_version = getProgramRealVersionString();
+  char *program_basename = getBaseNameNoSuffix(command_filename);
   char *config_filename = getProgramConfigFilename(command_filename);
-  char *userdata_basename = getBaseNameNoSuffix(command_filename);
   char *userdata_subdir;
 
   // read default program config, if existing
   if (fileExists(config_filename))
-  {
-    // if program config file exists, derive Unix user data directory from it
-    // (but only if the program config file is not generic "setup.conf" file)
-    if (!strEqual(getBaseNamePtr(config_filename), SETUP_FILENAME))
-    {
-      userdata_basename = getBaseName(config_filename);
-
-      if (strSuffix(userdata_basename, ".conf"))
-	userdata_basename[strlen(userdata_basename) - 5] = '\0';
-    }
-
     LoadSetupFromFilename(config_filename);
-  }
 
   // set program title from potentially redefined program title
   if (setup.internal.program_title != NULL &&
@@ -7795,7 +7782,7 @@ static void InitProgramConfig(char *command_filename)
 #if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MAC) || defined(PLATFORM_EMSCRIPTEN)
   userdata_subdir = program_title;
 #elif defined(PLATFORM_UNIX)
-  userdata_subdir = getStringCat2(".", userdata_basename);
+  userdata_subdir = getStringCat2(".", program_basename);
 #else
   userdata_subdir = USERDATA_DIRECTORY_OTHER;
 #endif
@@ -7811,7 +7798,7 @@ static void InitProgramConfig(char *command_filename)
   InitProgramInfo(command_filename,
 		  config_filename,
 		  userdata_subdir,
-		  program_title,
+		  program_basename,
 		  program_title,
 		  program_icon_file,
 		  COOKIE_PREFIX,