struct LevelInfo level, level_template;
struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL;
struct HiScore highscore[MAX_SCORE_ENTRIES];
struct LevelInfo level, level_template;
struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL;
struct HiScore highscore[MAX_SCORE_ENTRIES];
- "mm_polarisator_cross_1",
- "mm_polarisator_cross",
- "two-way polarisator (0\xb0)"
+ "mm_polarizer_cross_1",
+ "mm_polarizer_cross",
+ "two-way polarizer (0\xb0)"
- "mm_polarisator_cross_2",
- "mm_polarisator_cross",
- "two-way polarisator (22.5\xb0)"
+ "mm_polarizer_cross_2",
+ "mm_polarizer_cross",
+ "two-way polarizer (22.5\xb0)"
- "mm_polarisator_cross_3",
- "mm_polarisator_cross",
- "two-way polarisator (45\xb0)"
+ "mm_polarizer_cross_3",
+ "mm_polarizer_cross",
+ "two-way polarizer (45\xb0)"
- "mm_polarisator_cross_4",
- "mm_polarisator_cross",
- "two-way polarisator (67.5\xb0)"
+ "mm_polarizer_cross_4",
+ "mm_polarizer_cross",
+ "two-way polarizer (67.5\xb0)"
{
"df_wooden_grid_rotating_1",
"df_wooden_grid_rotating",
{
"df_wooden_grid_rotating_1",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_2",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_2",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_3",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_3",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_4",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_4",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_5",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_5",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_6",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_6",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_7",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_7",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_8",
"df_wooden_grid_rotating",
},
{
"df_wooden_grid_rotating_8",
"df_wooden_grid_rotating",
},
{
"df_steel_grid_rotating_1",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_1",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_2",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_2",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_3",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_3",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_4",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_4",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_5",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_5",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_6",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_6",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_7",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_7",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_8",
"df_steel_grid_rotating",
},
{
"df_steel_grid_rotating_8",
"df_steel_grid_rotating",
{ ".eating", ACTION_EATING, FALSE },
{ ".twinkling", ACTION_TWINKLING, FALSE },
{ ".splashing", ACTION_SPLASHING, FALSE },
{ ".eating", ACTION_EATING, FALSE },
{ ".twinkling", ACTION_TWINKLING, FALSE },
{ ".splashing", ACTION_SPLASHING, FALSE },
{ ".page[1]", ACTION_PAGE_1, FALSE },
{ ".page[2]", ACTION_PAGE_2, FALSE },
{ ".page[3]", ACTION_PAGE_3, FALSE },
{ ".page[1]", ACTION_PAGE_1, FALSE },
{ ".page[2]", ACTION_PAGE_2, FALSE },
{ ".page[3]", ACTION_PAGE_3, FALSE },
{ "font.game_info" },
{ "font.info.elements" },
{ "font.info.levelset" },
{ "font.game_info" },
{ "font.info.elements" },
{ "font.info.levelset" },
if (fileExists(config_filename))
{
// if program config file exists, derive Unix user data directory from it
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';
+ }