{
"mm_kettle",
"mm_kettle",
- "magic kettle"
+ "magic cauldron"
},
{
"mm_bomb",
"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
"-",
"-"
},
- {
- "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",
"\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"
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))
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)
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 = userdata_subdir_unix;
+ userdata_subdir = getStringCat2(".", userdata_basename);
#else
userdata_subdir = USERDATA_DIRECTORY_OTHER;
#endif