"mm_fuel",
"extra energy ball (empty)"
},
+ {
+ "mm_unused_156",
+ "unused",
+ "(not used)"
+ },
+ {
+ "mm_unused_157",
+ "unused",
+ "(not used)"
+ },
+ {
+ "mm_unused_158",
+ "unused",
+ "(not used)"
+ },
+ {
+ "mm_unused_159",
+ "unused",
+ "(not used)"
+ },
{
"df_mirror_1",
"df_mirror",
"mm_amoeba_wall",
"-",
},
+ {
+ "mm_pacman.eating.right",
+ "mm_pacman",
+ "pac man (eating right)"
+ },
+ {
+ "mm_pacman.eating.up",
+ "mm_pacman",
+ "pac man (eating up)"
+ },
+ {
+ "mm_pacman.eating.left",
+ "mm_pacman",
+ "pac man (eating left)"
+ },
+ {
+ "mm_pacman.eating.down",
+ "mm_pacman",
+ "pac man (eating down)"
+ },
/* ----------------------------------------------------------------------- */
/* "unreal" (and therefore not drawable) runtime elements */
{ ".eating", ACTION_EATING, FALSE },
{ ".twinkling", ACTION_TWINKLING, FALSE },
{ ".splashing", ACTION_SPLASHING, FALSE },
+ { ".hitting", ACTION_HITTING, FALSE },
{ ".page[1]", ACTION_PAGE_1, FALSE },
{ ".page[2]", ACTION_PAGE_2, FALSE },
{ ".page[3]", ACTION_PAGE_3, FALSE },
if (fileExists(config_filename))
{
// if program config file exists, derive Unix user data directory from it
- userdata_basename = getBaseName(config_filename);
+ // (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';
+ if (strSuffix(userdata_basename, ".conf"))
+ userdata_basename[strlen(userdata_basename) - 5] = '\0';
+ }
LoadSetupFromFilename(config_filename);
}