#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;
int game_status = -1;
int game_status_last_screen = -1;
boolean level_editor_test_game = FALSE;
+boolean score_info_tape_play = FALSE;
boolean network_playing = FALSE;
int key_joystick_mapping = 0;
SetupFileHash *graphic_token_hash = NULL;
SetupFileHash *font_token_hash = NULL;
SetupFileHash *hide_setup_hash = NULL;
+SetupFileHash *anim_url_hash = NULL;
// ----------------------------------------------------------------------------
{
"mm_kettle",
"mm_kettle",
- "magic kettle"
+ "magic cauldron"
},
{
"mm_bomb",
{
"mm_mirror_fixed_2",
"mm_mirror_fixed",
- "fixed mirror (0\xb0)"
+ "fixed mirror (45\xb0)"
},
{
"mm_mirror_fixed_3",
"mm_mirror_fixed",
- "fixed mirror (0\xb0)"
+ "fixed mirror (90\xb0)"
},
{
"mm_mirror_fixed_4",
"mm_mirror_fixed",
- "fixed mirror (0\xb0)"
+ "fixed mirror (135\xb0)"
},
{
"mm_steel_lock",
"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",
{
"df_wooden_grid_fixed_1",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (0\xb0)"
+ "fixed wooden polarizer (DF) (0\xb0)"
},
{
"df_wooden_grid_fixed_2",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (22.5\xb0)"
+ "fixed wooden polarizer (DF) (22.5\xb0)"
},
{
"df_wooden_grid_fixed_3",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (45\xb0)"
+ "fixed wooden polarizer (DF) (45\xb0)"
},
{
"df_wooden_grid_fixed_4",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (67.5\xb0)"
+ "fixed wooden polarizer (DF) (67.5\xb0)"
},
{
"df_wooden_grid_fixed_5",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (90\xb0)"
+ "fixed wooden polarizer (DF) (90\xb0)"
},
{
"df_wooden_grid_fixed_6",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (112.5\xb0)"
+ "fixed wooden polarizer (DF) (112.5\xb0)"
},
{
"df_wooden_grid_fixed_7",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (135\xb0)"
+ "fixed wooden polarizer (DF) (135\xb0)"
},
{
"df_wooden_grid_fixed_8",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (157.5\xb0)"
+ "fixed wooden polarizer (DF) (157.5\xb0)"
},
{
"df_steel_grid_fixed_1",
"df_steel_grid_fixed",
- "fixed steel polarizer (0\xb0)"
+ "fixed steel polarizer (DF) (0\xb0)"
},
{
"df_steel_grid_fixed_2",
"df_steel_grid_fixed",
- "fixed steel polarizer (22.5\xb0)"
+ "fixed steel polarizer (DF) (22.5\xb0)"
},
{
"df_steel_grid_fixed_3",
"df_steel_grid_fixed",
- "fixed steel polarizer (45\xb0)"
+ "fixed steel polarizer (DF) (45\xb0)"
},
{
"df_steel_grid_fixed_4",
"df_steel_grid_fixed",
- "fixed steel polarizer (67.5\xb0)"
+ "fixed steel polarizer (DF) (67.5\xb0)"
},
{
"df_steel_grid_fixed_5",
"df_steel_grid_fixed",
- "fixed steel polarizer (90\xb0)"
+ "fixed steel polarizer (DF) (90\xb0)"
},
{
"df_steel_grid_fixed_6",
"df_steel_grid_fixed",
- "fixed steel polarizer (112.5\xb0)"
+ "fixed steel polarizer (DF) (112.5\xb0)"
},
{
"df_steel_grid_fixed_7",
"df_steel_grid_fixed",
- "fixed steel polarizer (135\xb0)"
+ "fixed steel polarizer (DF) (135\xb0)"
},
{
"df_steel_grid_fixed_8",
"df_steel_grid_fixed",
- "fixed steel polarizer (157.5\xb0)"
+ "fixed steel polarizer (DF) (157.5\xb0)"
},
{
"df_wooden_wall_1",
"empty_space",
"empty space 16"
},
+ {
+ "df_mirror_fixed_1",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (0\xb0)"
+ },
+ {
+ "df_mirror_fixed_2",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (11.25\xb0)"
+ },
+ {
+ "df_mirror_fixed_3",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (22.5\xb0)"
+ },
+ {
+ "df_mirror_fixed_4",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (33.75\xb0)"
+ },
+ {
+ "df_mirror_fixed_5",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (45\xb0)"
+ },
+ {
+ "df_mirror_fixed_6",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (56.25\xb0)"
+ },
+ {
+ "df_mirror_fixed_7",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (67.5\xb0)"
+ },
+ {
+ "df_mirror_fixed_8",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (78.75\xb0)"
+ },
+ {
+ "df_mirror_fixed_9",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (90\xb0)"
+ },
+ {
+ "df_mirror_fixed_10",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (101.25\xb0)"
+ },
+ {
+ "df_mirror_fixed_11",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (112.5\xb0)"
+ },
+ {
+ "df_mirror_fixed_12",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (123.75\xb0)"
+ },
+ {
+ "df_mirror_fixed_13",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (135\xb0)"
+ },
+ {
+ "df_mirror_fixed_14",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (146.25\xb0)"
+ },
+ {
+ "df_mirror_fixed_15",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (157.5\xb0)"
+ },
+ {
+ "df_mirror_fixed_16",
+ "df_mirror_fixed",
+ "fixed mirror (DF style) (168.75\xb0)"
+ },
+ {
+ "df_slope_1",
+ "df_slope",
+ "slope (DF style) (45\xb0)"
+ },
+ {
+ "df_slope_2",
+ "df_slope",
+ "slope (DF style) (135\xb0)"
+ },
+ {
+ "df_slope_3",
+ "df_slope",
+ "slope (DF style) (225\xb0)"
+ },
+ {
+ "df_slope_4",
+ "df_slope",
+ "slope (DF style) (315\xb0)"
+ },
// --------------------------------------------------------------------------
// "real" (and therefore drawable) runtime elements
"mm_exit",
"-"
},
+ {
+ "mm_gray_ball.active",
+ "mm_gray_ball",
+ "-",
+ },
{
"mm_gray_ball.opening",
"mm_gray_ball",
"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",
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{
{ ".[DEFAULT]", GFX_SPECIAL_ARG_DEFAULT, },
+ { ".LOADING_INITIAL", GFX_SPECIAL_ARG_LOADING_INITIAL, },
{ ".LOADING", GFX_SPECIAL_ARG_LOADING, },
{ ".TITLE_INITIAL", GFX_SPECIAL_ARG_TITLE_INITIAL, },
{ ".TITLE_INITIAL_1", GFX_SPECIAL_ARG_TITLE_INITIAL_1, },
{ ".LEVELS", GFX_SPECIAL_ARG_LEVELS },
{ ".LEVELNR", GFX_SPECIAL_ARG_LEVELNR },
{ ".SCORES", GFX_SPECIAL_ARG_SCORES, },
+ { ".SCOREINFO", GFX_SPECIAL_ARG_SCOREINFO, },
{ ".EDITOR", GFX_SPECIAL_ARG_EDITOR, },
{ ".INFO", GFX_SPECIAL_ARG_INFO, },
{ ".SETUP", GFX_SPECIAL_ARG_SETUP, },
{ ".CRUMBLED", GFX_SPECIAL_ARG_CRUMBLED, },
{ ".MAINONLY", GFX_SPECIAL_ARG_MAINONLY, },
{ ".NAMESONLY", GFX_SPECIAL_ARG_NAMESONLY, },
+ { ".SCORESONLY", GFX_SPECIAL_ARG_SCORESONLY, },
{ ".TYPENAME", GFX_SPECIAL_ARG_TYPENAME, },
{ ".TYPENAMES", GFX_SPECIAL_ARG_TYPENAMES, },
{ ".SUBMENU", GFX_SPECIAL_ARG_SUBMENU, },
{ "font.envelope_2" },
{ "font.envelope_3" },
{ "font.envelope_4" },
+ { "font.request_narrow" },
{ "font.request" },
{ "font.input_1.active" },
{ "font.input_2.active" },
"\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 *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;
-#if defined(PLATFORM_UNIX)
- char *userdata_subdir_unix;
-#endif
// 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);
- }
-
-#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_icon_file) > 0)
program_icon_file = getStringCopy(setup.internal.program_icon_file);
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_MACOSX)
+#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(".", program_basename);
#else
userdata_subdir = USERDATA_DIRECTORY_OTHER;
#endif
InitProgramInfo(command_filename,
config_filename,
userdata_subdir,
- program_title,
+ program_basename,
program_title,
program_icon_file,
COOKIE_PREFIX,
projects / rocksndiamonds.git / blobdiff