X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=d36c3f2aca056ddf14f08af9ca1e93498a54aac3;hp=690296dded7266b0be70af083fe264a0f1588339;hb=3ea7bc006da99f1b13d817285820023b30ce2e38;hpb=b59d111d850aa928e2a839ba026adde64927d5a5 diff --git a/src/main.c b/src/main.c index 690296dd..d36c3f2a 100644 --- a/src/main.c +++ b/src/main.c @@ -33,15 +33,13 @@ int game_status = -1; boolean game_status_last_screen = -1; boolean level_editor_test_game = FALSE; boolean network_playing = FALSE; - -#if defined(TARGET_SDL) boolean network_server = FALSE; SDL_Thread *server_thread; -#endif int key_joystick_mapping = 0; short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +short Last[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; short MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; short MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; short MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; @@ -125,15 +123,11 @@ int BX1, BY1; int BX2, BY2; int SBX_Left, SBX_Right; int SBY_Upper, SBY_Lower; -int ZX, ZY; -int ExitX, ExitY; -int AllPlayersGone; int TimeFrames, TimePlayed, TimeLeft, TapeTime; boolean network_player_action_received = FALSE; -struct LevelSetInfo levelset; struct LevelInfo level, level_template; struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL; struct HiScore highscore[MAX_SCORE_ENTRIES]; @@ -183,22 +177,23 @@ SetupFileHash *image_config_hash = NULL; SetupFileHash *element_token_hash = NULL; SetupFileHash *graphic_token_hash = NULL; SetupFileHash *font_token_hash = NULL; +SetupFileHash *hide_setup_hash = NULL; -/* ------------------------------------------------------------------------- */ -/* element definitions */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// element definitions +// ---------------------------------------------------------------------------- struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1]; -/* this contains predefined structure elements to initialize "element_info" */ +// this contains predefined structure elements to initialize "element_info" struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = { - /* keyword to start parser: "ELEMENT_INFO_START" <-- do not change! */ + // keyword to start parser: "ELEMENT_INFO_START" <-- do not change! - /* ----------------------------------------------------------------------- */ - /* "real" level file elements */ - /* ----------------------------------------------------------------------- */ + // -------------------------------------------------------------------------- + // "real" level file elements + // -------------------------------------------------------------------------- { "empty_space", @@ -4514,399 +4509,2199 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "from_level_template", "element taken from level template" }, - - /* ----------------------------------------------------------------------- */ - /* "real" (and therefore drawable) runtime elements */ - /* ----------------------------------------------------------------------- */ - { - "dynabomb_player_1.active", - "dynabomb", - "-" + "mm_empty_space", + "empty_space", + "empty space" }, { - "dynabomb_player_2.active", - "dynabomb", - "-" + "mm_mirror_1", + "mm_mirror", + "mirror (0\xb0)" }, { - "dynabomb_player_3.active", - "dynabomb", - "-" + "mm_mirror_2", + "mm_mirror", + "mirror (11.25\xb0)" }, { - "dynabomb_player_4.active", - "dynabomb", - "-" + "mm_mirror_3", + "mm_mirror", + "mirror (22.5\xb0)" }, { - "sp_disk_red.active", - "dynamite", - "-" + "mm_mirror_4", + "mm_mirror", + "mirror (33.75\xb0)" }, { - "switchgate.opening", - "switchgate", - "-" + "mm_mirror_5", + "mm_mirror", + "mirror (45\xb0)" }, { - "switchgate.closing", - "switchgate", - "-" + "mm_mirror_6", + "mm_mirror", + "mirror (56.25\xb0)" }, { - "timegate.opening", - "timegate", - "-" + "mm_mirror_7", + "mm_mirror", + "mirror (67.5\xb0)" }, { - "timegate.closing", - "timegate", - "-" + "mm_mirror_8", + "mm_mirror", + "mirror (78.75\xb0)" }, { - "pearl.breaking", - "pearl", - "-" + "mm_mirror_9", + "mm_mirror", + "mirror (90\xb0)" }, { - "trap.active", - "trap", - "-" + "mm_mirror_10", + "mm_mirror", + "mirror (101.25\xb0)" }, { - "invisible_steelwall.active", - "steelwall", - "-" + "mm_mirror_11", + "mm_mirror", + "mirror (112.5\xb0)" }, { - "invisible_wall.active", - "wall", - "-" + "mm_mirror_12", + "mm_mirror", + "mirror (123.75\xb0)" }, { - "invisible_sand.active", - "sand", - "-" + "mm_mirror_13", + "mm_mirror", + "mirror (135\xb0)" }, { - "conveyor_belt_1_left.active", - "conveyor_belt", - "-" + "mm_mirror_14", + "mm_mirror", + "mirror (146.25\xb0)" }, { - "conveyor_belt_1_middle.active", - "conveyor_belt", - "-" + "mm_mirror_15", + "mm_mirror", + "mirror (157.5\xb0)" }, { - "conveyor_belt_1_right.active", - "conveyor_belt", - "-" + "mm_mirror_16", + "mm_mirror", + "mirror (168.75\xb0)" }, { - "conveyor_belt_2_left.active", - "conveyor_belt", - "-" + "mm_steel_grid_fixed_1", + "mm_steel_grid_fixed", + "fixed steel polarizer (0\xb0)" }, { - "conveyor_belt_2_middle.active", - "conveyor_belt", - "-" + "mm_steel_grid_fixed_2", + "mm_steel_grid_fixed", + "fixed steel polarizer (90\xb0)" }, { - "conveyor_belt_2_right.active", - "conveyor_belt", - "-" + "mm_steel_grid_fixed_3", + "mm_steel_grid_fixed", + "fixed steel polarizer (45\xb0)" }, { - "conveyor_belt_3_left.active", - "conveyor_belt", - "-" + "mm_steel_grid_fixed_4", + "mm_steel_grid_fixed", + "fixed steel polarizer (135\xb0)" }, { - "conveyor_belt_3_middle.active", - "conveyor_belt", - "-" + "mm_mcduffin.right", + "mm_mcduffin", + "Gregor McDuffin (looking right)" }, { - "conveyor_belt_3_right.active", - "conveyor_belt", - "-" + "mm_mcduffin.up", + "mm_mcduffin", + "Gregor McDuffin (looking up)" }, { - "conveyor_belt_4_left.active", - "conveyor_belt", - "-" + "mm_mcduffin.left", + "mm_mcduffin", + "Gregor McDuffin (looking left)" }, { - "conveyor_belt_4_middle.active", - "conveyor_belt", - "-" + "mm_mcduffin.down", + "mm_mcduffin", + "Gregor McDuffin (looking down)" }, { - "conveyor_belt_4_right.active", - "conveyor_belt", - "-" + "mm_exit_closed", + "mm_exit", + "closed exit (MM style)" }, { - "exit.opening", - "exit", - "-" + "mm_exit_opening_1", + "mm_exit", + "opening exit 1" }, { - "exit.closing", - "exit", - "-" + "mm_exit_opening_2", + "mm_exit", + "opening exit 2" }, { - "steel_exit.opening", - "steel_exit", - "-" + "mm_exit_open", + "mm_exit", + "open exit (MM style)" }, { - "steel_exit.closing", - "steel_exit", - "-" + "mm_kettle", + "mm_kettle", + "magic kettle" }, { - "em_exit.opening", - "em_exit", - "-" + "mm_bomb", + "mm_bomb", + "bomb (MM style)" }, { - "em_exit.closing", - "em_exit", - "-" + "mm_prism", + "mm_prism", + "prism" }, { - "em_steel_exit.opening", - "em_steel_exit", - "-" + "mm_steel_wall_1", + "mm_steel_wall", + "steel wall" }, { - "em_steel_exit.closing", - "em_steel_exit", - "-" + "mm_steel_wall_2", + "mm_steel_wall", + "steel wall" }, { - "sp_exit.opening", - "sp_exit", - "-" + "mm_steel_wall_3", + "mm_steel_wall", + "steel wall" }, { - "sp_exit.closing", - "sp_exit", - "-" + "mm_steel_wall_4", + "mm_steel_wall", + "steel wall" }, { - "sp_exit_open", - "sp_exit", - "-" + "mm_steel_wall_5", + "mm_steel_wall", + "steel wall" }, { - "sp_terminal.active", - "sp_terminal", - "-" + "mm_steel_wall_6", + "mm_steel_wall", + "steel wall" }, { - "sp_buggy_base.activating", - "sp_buggy_base", - "-" + "mm_steel_wall_7", + "mm_steel_wall", + "steel wall" }, { - "sp_buggy_base.active", - "sp_buggy_base", - "-" + "mm_steel_wall_8", + "mm_steel_wall", + "steel wall" }, { - "sp_murphy_clone", - "murphy_clone", - "-" + "mm_steel_wall_9", + "mm_steel_wall", + "steel wall" }, { - "amoeba.dropping", - "amoeba", - "-" + "mm_steel_wall_10", + "mm_steel_wall", + "steel wall" }, { - "quicksand.emptying", - "quicksand", - "-" + "mm_steel_wall_11", + "mm_steel_wall", + "steel wall" }, { - "quicksand_fast.emptying", - "quicksand", - "-" + "mm_steel_wall_12", + "mm_steel_wall", + "steel wall" }, { - "magic_wall.active", - "magic_wall", - "-" + "mm_steel_wall_13", + "mm_steel_wall", + "steel wall" }, { - "bd_magic_wall.active", - "magic_wall", - "-" + "mm_steel_wall_14", + "mm_steel_wall", + "steel wall" }, { - "dc_magic_wall.active", - "magic_wall", - "-" + "mm_steel_wall_15", + "mm_steel_wall", + "steel wall" }, { - "magic_wall_full", - "magic_wall", - "-" + "mm_steel_wall_16", + "mm_steel_wall", + "steel wall" }, { - "bd_magic_wall_full", - "magic_wall", - "-" + "mm_wooden_wall_1", + "mm_wooden_wall", + "wooden wall" }, { - "dc_magic_wall_full", - "magic_wall", - "-" + "mm_wooden_wall_2", + "mm_wooden_wall", + "wooden wall" }, { - "magic_wall.emptying", - "magic_wall", - "-" + "mm_wooden_wall_3", + "mm_wooden_wall", + "wooden wall" }, { - "bd_magic_wall.emptying", - "magic_wall", - "-" + "mm_wooden_wall_4", + "mm_wooden_wall", + "wooden wall" }, { - "dc_magic_wall.emptying", - "magic_wall", - "-" + "mm_wooden_wall_5", + "mm_wooden_wall", + "wooden wall" }, { - "magic_wall_dead", - "magic_wall", - "-" + "mm_wooden_wall_6", + "mm_wooden_wall", + "wooden wall" }, { - "bd_magic_wall_dead", - "magic_wall", - "-" + "mm_wooden_wall_7", + "mm_wooden_wall", + "wooden wall" }, { - "dc_magic_wall_dead", - "magic_wall", - "-" + "mm_wooden_wall_8", + "mm_wooden_wall", + "wooden wall" }, - { - "emc_fake_grass.active", - "fake_grass", - "-" + "mm_wooden_wall_9", + "mm_wooden_wall", + "wooden wall" }, { - "gate_1_gray.active", - "gate", - "" + "mm_wooden_wall_10", + "mm_wooden_wall", + "wooden wall" }, { - "gate_2_gray.active", - "gate", - "" + "mm_wooden_wall_11", + "mm_wooden_wall", + "wooden wall" }, { - "gate_3_gray.active", - "gate", - "" + "mm_wooden_wall_12", + "mm_wooden_wall", + "wooden wall" }, { - "gate_4_gray.active", - "gate", - "" + "mm_wooden_wall_13", + "mm_wooden_wall", + "wooden wall" }, { - "em_gate_1_gray.active", - "gate", - "" + "mm_wooden_wall_14", + "mm_wooden_wall", + "wooden wall" }, { - "em_gate_2_gray.active", - "gate", - "" + "mm_wooden_wall_15", + "mm_wooden_wall", + "wooden wall" }, { - "em_gate_3_gray.active", - "gate", - "" + "mm_wooden_wall_16", + "mm_wooden_wall", + "wooden wall" }, { - "em_gate_4_gray.active", - "gate", - "" + "mm_ice_wall_1", + "mm_ice_wall", + "ice wall" }, { - "emc_gate_5_gray.active", - "gate", - "", + "mm_ice_wall_2", + "mm_ice_wall", + "ice wall" }, { - "emc_gate_6_gray.active", - "gate", - "", + "mm_ice_wall_3", + "mm_ice_wall", + "ice wall" }, { - "emc_gate_7_gray.active", - "gate", - "", + "mm_ice_wall_4", + "mm_ice_wall", + "ice wall" }, { - "emc_gate_8_gray.active", - "gate", - "", + "mm_ice_wall_5", + "mm_ice_wall", + "ice wall" }, { - "dc_gate_white_gray.active", - "gate", - "", + "mm_ice_wall_6", + "mm_ice_wall", + "ice wall" }, { - "emc_dripper.active", - "dripper", - "dripper" + "mm_ice_wall_7", + "mm_ice_wall", + "ice wall" }, { - "emc_spring_bumper.active", - "emc_spring_bumper", - "spring bumper", + "mm_ice_wall_8", + "mm_ice_wall", + "ice wall" }, - - /* ----------------------------------------------------------------------- */ - /* "unreal" (and therefore not drawable) runtime elements */ - /* ----------------------------------------------------------------------- */ - { - "blocked", - "-", - "-" + "mm_ice_wall_9", + "mm_ice_wall", + "ice wall" }, { - "explosion", - "-", - "-" + "mm_ice_wall_10", + "mm_ice_wall", + "ice wall" }, { - "nut.breaking", - "-", - "-" + "mm_ice_wall_11", + "mm_ice_wall", + "ice wall" }, { - "diamond.breaking", - "-", - "-" + "mm_ice_wall_12", + "mm_ice_wall", + "ice wall" }, { - "acid_splash_left", + "mm_ice_wall_13", + "mm_ice_wall", + "ice wall" + }, + { + "mm_ice_wall_14", + "mm_ice_wall", + "ice wall" + }, + { + "mm_ice_wall_15", + "mm_ice_wall", + "ice wall" + }, + { + "mm_ice_wall_16", + "mm_ice_wall", + "ice wall" + }, + { + "mm_amoeba_wall_1", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_2", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_3", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_4", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_5", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_6", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_7", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_8", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_9", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_10", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_11", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_12", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_13", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_14", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_15", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_amoeba_wall_16", + "mm_amoeba_wall", + "amoeba wall" + }, + { + "mm_wooden_block", + "mm_wooden_block", + "wooden block" + }, + { + "mm_gray_ball", + "mm_gray_ball", + "gray ball" + }, + { + "mm_teleporter_1", + "mm_teleporter", + "teleporter (0\xb0)" + }, + { + "mm_teleporter_2", + "mm_teleporter", + "teleporter (22.5\xb0)" + }, + { + "mm_teleporter_3", + "mm_teleporter", + "teleporter (45\xb0)" + }, + { + "mm_teleporter_4", + "mm_teleporter", + "teleporter (67.5\xb0)" + }, + { + "mm_teleporter_5", + "mm_teleporter", + "teleporter (90\xb0)" + }, + { + "mm_teleporter_6", + "mm_teleporter", + "teleporter (112.5\xb0)" + }, + { + "mm_teleporter_7", + "mm_teleporter", + "teleporter (135\xb0)" + }, + { + "mm_teleporter_8", + "mm_teleporter", + "teleporter (157.5\xb0)" + }, + { + "mm_teleporter_9", + "mm_teleporter", + "teleporter (180\xb0)" + }, + { + "mm_teleporter_10", + "mm_teleporter", + "teleporter (202.5\xb0)" + }, + { + "mm_teleporter_11", + "mm_teleporter", + "teleporter (225\xb0)" + }, + { + "mm_teleporter_12", + "mm_teleporter", + "teleporter (247.5\xb0)" + }, + { + "mm_teleporter_13", + "mm_teleporter", + "teleporter (270\xb0)" + }, + { + "mm_teleporter_14", + "mm_teleporter", + "teleporter (292.5\xb0)" + }, + { + "mm_teleporter_15", + "mm_teleporter", + "teleporter (315\xb0)" + }, + { + "mm_teleporter_16", + "mm_teleporter", + "teleporter (337.5\xb0)" + }, + { + "mm_fuse.active", + "mm_fuse", + "fuse (on)" + }, + { + "mm_pacman.right", + "mm_pacman", + "pac man (starts moving right)" + }, + { + "mm_pacman.up", + "mm_pacman", + "pac man (starts moving up)" + }, + { + "mm_pacman.left", + "mm_pacman", + "pac man (starts moving left)" + }, + { + "mm_pacman.down", + "mm_pacman", + "pac man (starts moving down)" + }, + { + "mm_polarizer_1", + "mm_polarizer", + "polarizer (0\xb0)" + }, + { + "mm_polarizer_2", + "mm_polarizer", + "polarizer (11.25\xb0)" + }, + { + "mm_polarizer_3", + "mm_polarizer", + "polarizer (22.5\xb0)" + }, + { + "mm_polarizer_4", + "mm_polarizer", + "polarizer (33.75\xb0)" + }, + { + "mm_polarizer_5", + "mm_polarizer", + "polarizer (45\xb0)" + }, + { + "mm_polarizer_6", + "mm_polarizer", + "polarizer (56.25\xb0)" + }, + { + "mm_polarizer_7", + "mm_polarizer", + "polarizer (67.5\xb0)" + }, + { + "mm_polarizer_8", + "mm_polarizer", + "polarizer (78.75\xb0)" + }, + { + "mm_polarizer_9", + "mm_polarizer", + "polarizer (90\xb0)" + }, + { + "mm_polarizer_10", + "mm_polarizer", + "polarizer (101.25\xb0)" + }, + { + "mm_polarizer_11", + "mm_polarizer", + "polarizer (112.5\xb0)" + }, + { + "mm_polarizer_12", + "mm_polarizer", + "polarizer (123.75\xb0)" + }, + { + "mm_polarizer_13", + "mm_polarizer", + "polarizer (135\xb0)" + }, + { + "mm_polarizer_14", + "mm_polarizer", + "polarizer (146.25\xb0)" + }, + { + "mm_polarizer_15", + "mm_polarizer", + "polarizer (157.5\xb0)" + }, + { + "mm_polarizer_16", + "mm_polarizer", + "polarizer (168.75\xb0)" + }, + { + "mm_polarizer_cross_1", + "mm_polarizer_cross", + "two-way polarizer (0\xb0)" + }, + { + "mm_polarizer_cross_2", + "mm_polarizer_cross", + "two-way polarizer (22.5\xb0)" + }, + { + "mm_polarizer_cross_3", + "mm_polarizer_cross", + "two-way polarizer (45\xb0)" + }, + { + "mm_polarizer_cross_4", + "mm_polarizer_cross", + "two-way polarizer (67.5\xb0)" + }, + { + "mm_mirror_fixed_1", + "mm_mirror_fixed", + "fixed mirror (0\xb0)" + }, + { + "mm_mirror_fixed_2", + "mm_mirror_fixed", + "fixed mirror (0\xb0)" + }, + { + "mm_mirror_fixed_3", + "mm_mirror_fixed", + "fixed mirror (0\xb0)" + }, + { + "mm_mirror_fixed_4", + "mm_mirror_fixed", + "fixed mirror (0\xb0)" + }, + { + "mm_steel_lock", + "mm_steel_lock", + "steel lock" + }, + { + "mm_key", + "mm_key", + "key (MM style)" + }, + { + "mm_lightbulb", + "mm_lightbulb", + "light bulb (off)" + }, + { + "mm_lightbulb.active", + "mm_lightbulb", + "light bulb (on)" + }, + { + "mm_lightball", + "mm_lightball", + "bonus ball" + }, + { + "mm_steel_block", + "mm_steel_block", + "steel block" + }, + { + "mm_wooden_lock", + "mm_wooden_lock", + "wooden lock" + }, + { + "mm_fuel_full", + "mm_fuel", + "extra energy ball (full)" + }, + { + "mm_wooden_grid_fixed_1", + "mm_wooden_grid_fixed", + "fixed wooden polarizer (0\xb0)" + }, + { + "mm_wooden_grid_fixed_2", + "mm_wooden_grid_fixed", + "fixed wooden polarizer (90\xb0)" + }, + { + "mm_wooden_grid_fixed_3", + "mm_wooden_grid_fixed", + "fixed wooden polarizer (45\xb0)" + }, + { + "mm_wooden_grid_fixed_4", + "mm_wooden_grid_fixed", + "fixed wooden polarizer (135\xb0)" + }, + { + "mm_fuel_empty", + "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", + "mirror (DF style) (0\xb0)" + }, + { + "df_mirror_2", + "df_mirror", + "mirror (DF style) (11.25\xb0)" + }, + { + "df_mirror_3", + "df_mirror", + "mirror (DF style) (22.5\xb0)" + }, + { + "df_mirror_4", + "df_mirror", + "mirror (DF style) (33.75\xb0)" + }, + { + "df_mirror_5", + "df_mirror", + "mirror (DF style) (45\xb0)" + }, + { + "df_mirror_6", + "df_mirror", + "mirror (DF style) (56.25\xb0)" + }, + { + "df_mirror_7", + "df_mirror", + "mirror (DF style) (67.5\xb0)" + }, + { + "df_mirror_8", + "df_mirror", + "mirror (DF style) (78.75\xb0)" + }, + { + "df_mirror_9", + "df_mirror", + "mirror (DF style) (90\xb0)" + }, + { + "df_mirror_10", + "df_mirror", + "mirror (DF style) (101.25\xb0)" + }, + { + "df_mirror_11", + "df_mirror", + "mirror (DF style) (112.5\xb0)" + }, + { + "df_mirror_12", + "df_mirror", + "mirror (DF style) (123.75\xb0)" + }, + { + "df_mirror_13", + "df_mirror", + "mirror (DF style) (135\xb0)" + }, + { + "df_mirror_14", + "df_mirror", + "mirror (DF style) (146.25\xb0)" + }, + { + "df_mirror_15", + "df_mirror", + "mirror (DF style) (157.5\xb0)" + }, + { + "df_mirror_16", + "df_mirror", + "mirror (DF style) (168.75\xb0)" + }, + { + "df_wooden_grid_fixed_1", + "df_wooden_grid_fixed", + "fixed wooden polarizer (0\xb0)" + }, + { + "df_wooden_grid_fixed_2", + "df_wooden_grid_fixed", + "fixed wooden polarizer (22.5\xb0)" + }, + { + "df_wooden_grid_fixed_3", + "df_wooden_grid_fixed", + "fixed wooden polarizer (45\xb0)" + }, + { + "df_wooden_grid_fixed_4", + "df_wooden_grid_fixed", + "fixed wooden polarizer (67.5\xb0)" + }, + { + "df_wooden_grid_fixed_5", + "df_wooden_grid_fixed", + "fixed wooden polarizer (90\xb0)" + }, + { + "df_wooden_grid_fixed_6", + "df_wooden_grid_fixed", + "fixed wooden polarizer (112.5\xb0)" + }, + { + "df_wooden_grid_fixed_7", + "df_wooden_grid_fixed", + "fixed wooden polarizer (135\xb0)" + }, + { + "df_wooden_grid_fixed_8", + "df_wooden_grid_fixed", + "fixed wooden polarizer (157.5\xb0)" + }, + { + "df_steel_grid_fixed_1", + "df_steel_grid_fixed", + "fixed steel polarizer (0\xb0)" + }, + { + "df_steel_grid_fixed_2", + "df_steel_grid_fixed", + "fixed steel polarizer (22.5\xb0)" + }, + { + "df_steel_grid_fixed_3", + "df_steel_grid_fixed", + "fixed steel polarizer (45\xb0)" + }, + { + "df_steel_grid_fixed_4", + "df_steel_grid_fixed", + "fixed steel polarizer (67.5\xb0)" + }, + { + "df_steel_grid_fixed_5", + "df_steel_grid_fixed", + "fixed steel polarizer (90\xb0)" + }, + { + "df_steel_grid_fixed_6", + "df_steel_grid_fixed", + "fixed steel polarizer (112.5\xb0)" + }, + { + "df_steel_grid_fixed_7", + "df_steel_grid_fixed", + "fixed steel polarizer (135\xb0)" + }, + { + "df_steel_grid_fixed_8", + "df_steel_grid_fixed", + "fixed steel polarizer (157.5\xb0)" + }, + { + "df_wooden_wall_1", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_2", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_3", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_4", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_5", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_6", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_7", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_8", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_9", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_10", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_11", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_12", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_13", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_14", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_15", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_wooden_wall_16", + "df_wooden_wall", + "wooden wall (DF style)" + }, + { + "df_steel_wall_1", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_2", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_3", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_4", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_5", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_6", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_7", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_8", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_9", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_10", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_11", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_12", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_13", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_14", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_15", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_steel_wall_16", + "df_steel_wall", + "steel wall (DF style)" + }, + { + "df_empty_space", + "empty_space", + "empty space" + }, + { + "df_cell", + "df_cell", + "cell" + }, + { + "df_mine", + "df_mine", + "mine" + }, + { + "df_refractor", + "df_refractor", + "refractor" + }, + { + "df_laser.right", + "df_laser", + "laser cannon (shooting right)" + }, + { + "df_laser.up", + "df_laser", + "laser cannon (shooting up)" + }, + { + "df_laser.left", + "df_laser", + "laser cannon (shooting left)" + }, + { + "df_laser.down", + "df_laser", + "laser cannon (shooting down)" + }, + { + "df_receiver.right", + "df_receiver", + "laser receiver (directed right)" + }, + { + "df_receiver.up", + "df_receiver", + "laser receiver (directed up)" + }, + { + "df_receiver.left", + "df_receiver", + "laser receiver (directed left)" + }, + { + "df_receiver.down", + "df_receiver", + "laser receiver (directed down)" + }, + { + "df_fibre_optic_red_1", + "df_fibre_optic", + "red fibre optic (part 1)" + }, + { + "df_fibre_optic_red_2", + "df_fibre_optic", + "red fibre optic (part 2)" + }, + { + "df_fibre_optic_yellow_1", + "df_fibre_optic", + "yellow fibre optic (part 1)" + }, + { + "df_fibre_optic_yellow_2", + "df_fibre_optic", + "yellow fibre optic (part 2)" + }, + { + "df_fibre_optic_green_1", + "df_fibre_optic", + "green fibre optic (part 1)" + }, + { + "df_fibre_optic_green_2", + "df_fibre_optic", + "green fibre optic (part 2)" + }, + { + "df_fibre_optic_blue_1", + "df_fibre_optic", + "blue fibre optic (part 1)" + }, + { + "df_fibre_optic_blue_2", + "df_fibre_optic", + "blue fibre optic (part 2)" + }, + { + "df_mirror_rotating_1", + "df_mirror_rotating", + "rotating mirror (0\xb0)" + }, + { + "df_mirror_rotating_2", + "df_mirror_rotating", + "rotating mirror (11.25\xb0)" + }, + { + "df_mirror_rotating_3", + "df_mirror_rotating", + "rotating mirror (22.5\xb0)" + }, + { + "df_mirror_rotating_4", + "df_mirror_rotating", + "rotating mirror (33.75\xb0)" + }, + { + "df_mirror_rotating_5", + "df_mirror_rotating", + "rotating mirror (45\xb0)" + }, + { + "df_mirror_rotating_6", + "df_mirror_rotating", + "rotating mirror (56.25\xb0)" + }, + { + "df_mirror_rotating_7", + "df_mirror_rotating", + "rotating mirror (67.5\xb0)" + }, + { + "df_mirror_rotating_8", + "df_mirror_rotating", + "rotating mirror (78.75\xb0)" + }, + { + "df_mirror_rotating_9", + "df_mirror_rotating", + "rotating mirror (90\xb0)" + }, + { + "df_mirror_rotating_10", + "df_mirror_rotating", + "rotating mirror (101.25\xb0)" + }, + { + "df_mirror_rotating_11", + "df_mirror_rotating", + "rotating mirror (112.5\xb0)" + }, + { + "df_mirror_rotating_12", + "df_mirror_rotating", + "rotating mirror (123.75\xb0)" + }, + { + "df_mirror_rotating_13", + "df_mirror_rotating", + "rotating mirror (135\xb0)" + }, + { + "df_mirror_rotating_14", + "df_mirror_rotating", + "rotating mirror (146.25\xb0)" + }, + { + "df_mirror_rotating_15", + "df_mirror_rotating", + "rotating mirror (157.5\xb0)" + }, + { + "df_mirror_rotating_16", + "df_mirror_rotating", + "rotating mirror (168.75\xb0)" + }, + { + "df_wooden_grid_rotating_1", + "df_wooden_grid_rotating", + "rotating wooden polarizer (0\xb0)" + }, + { + "df_wooden_grid_rotating_2", + "df_wooden_grid_rotating", + "rotating wooden polarizer (22.5\xb0)" + }, + { + "df_wooden_grid_rotating_3", + "df_wooden_grid_rotating", + "rotating wooden polarizer (45\xb0)" + }, + { + "df_wooden_grid_rotating_4", + "df_wooden_grid_rotating", + "rotating wooden polarizer (67.5\xb0)" + }, + { + "df_wooden_grid_rotating_5", + "df_wooden_grid_rotating", + "rotating wooden polarizer (90\xb0)" + }, + { + "df_wooden_grid_rotating_6", + "df_wooden_grid_rotating", + "rotating wooden polarizer (112.5\xb0)" + }, + { + "df_wooden_grid_rotating_7", + "df_wooden_grid_rotating", + "rotating wooden polarizer (135\xb0)" + }, + { + "df_wooden_grid_rotating_8", + "df_wooden_grid_rotating", + "rotating wooden polarizer (157.5\xb0)" + }, + { + "df_steel_grid_rotating_1", + "df_steel_grid_rotating", + "rotating steel polarizer (0\xb0)" + }, + { + "df_steel_grid_rotating_2", + "df_steel_grid_rotating", + "rotating steel polarizer (22.5\xb0)" + }, + { + "df_steel_grid_rotating_3", + "df_steel_grid_rotating", + "rotating steel polarizer (45\xb0)" + }, + { + "df_steel_grid_rotating_4", + "df_steel_grid_rotating", + "rotating steel polarizer (67.5\xb0)" + }, + { + "df_steel_grid_rotating_5", + "df_steel_grid_rotating", + "rotating steel polarizer (90\xb0)" + }, + { + "df_steel_grid_rotating_6", + "df_steel_grid_rotating", + "rotating steel polarizer (112.5\xb0)" + }, + { + "df_steel_grid_rotating_7", + "df_steel_grid_rotating", + "rotating steel polarizer (135\xb0)" + }, + { + "df_steel_grid_rotating_8", + "df_steel_grid_rotating", + "rotating steel polarizer (157.5\xb0)" + }, + { + "mm_teleporter_red_1", + "mm_teleporter", + "red teleporter (0\xb0)" + }, + { + "mm_teleporter_red_2", + "mm_teleporter", + "red teleporter (22.5\xb0)" + }, + { + "mm_teleporter_red_3", + "mm_teleporter", + "red teleporter (45\xb0)" + }, + { + "mm_teleporter_red_4", + "mm_teleporter", + "red teleporter (67.5\xb0)" + }, + { + "mm_teleporter_red_5", + "mm_teleporter", + "red teleporter (90\xb0)" + }, + { + "mm_teleporter_red_6", + "mm_teleporter", + "red teleporter (112.5\xb0)" + }, + { + "mm_teleporter_red_7", + "mm_teleporter", + "red teleporter (135\xb0)" + }, + { + "mm_teleporter_red_8", + "mm_teleporter", + "red teleporter (157.5\xb0)" + }, + { + "mm_teleporter_red_9", + "mm_teleporter", + "red teleporter (180\xb0)" + }, + { + "mm_teleporter_red_10", + "mm_teleporter", + "red teleporter (202.5\xb0)" + }, + { + "mm_teleporter_red_11", + "mm_teleporter", + "red teleporter (225\xb0)" + }, + { + "mm_teleporter_red_12", + "mm_teleporter", + "red teleporter (247.5\xb0)" + }, + { + "mm_teleporter_red_13", + "mm_teleporter", + "red teleporter (270\xb0)" + }, + { + "mm_teleporter_red_14", + "mm_teleporter", + "red teleporter (292.5\xb0)" + }, + { + "mm_teleporter_red_15", + "mm_teleporter", + "red teleporter (315\xb0)" + }, + { + "mm_teleporter_red_16", + "mm_teleporter", + "red teleporter (337.5\xb0)" + }, + { + "mm_teleporter_yellow_1", + "mm_teleporter", + "yellow teleporter (0\xb0)" + }, + { + "mm_teleporter_yellow_2", + "mm_teleporter", + "yellow teleporter (22.5\xb0)" + }, + { + "mm_teleporter_yellow_3", + "mm_teleporter", + "yellow teleporter (45\xb0)" + }, + { + "mm_teleporter_yellow_4", + "mm_teleporter", + "yellow teleporter (67.5\xb0)" + }, + { + "mm_teleporter_yellow_5", + "mm_teleporter", + "yellow teleporter (90\xb0)" + }, + { + "mm_teleporter_yellow_6", + "mm_teleporter", + "yellow teleporter (112.5\xb0)" + }, + { + "mm_teleporter_yellow_7", + "mm_teleporter", + "yellow teleporter (135\xb0)" + }, + { + "mm_teleporter_yellow_8", + "mm_teleporter", + "yellow teleporter (157.5\xb0)" + }, + { + "mm_teleporter_yellow_9", + "mm_teleporter", + "yellow teleporter (180\xb0)" + }, + { + "mm_teleporter_yellow_10", + "mm_teleporter", + "yellow teleporter (202.5\xb0)" + }, + { + "mm_teleporter_yellow_11", + "mm_teleporter", + "yellow teleporter (225\xb0)" + }, + { + "mm_teleporter_yellow_12", + "mm_teleporter", + "yellow teleporter (247.5\xb0)" + }, + { + "mm_teleporter_yellow_13", + "mm_teleporter", + "yellow teleporter (270\xb0)" + }, + { + "mm_teleporter_yellow_14", + "mm_teleporter", + "yellow teleporter (292.5\xb0)" + }, + { + "mm_teleporter_yellow_15", + "mm_teleporter", + "yellow teleporter (315\xb0)" + }, + { + "mm_teleporter_yellow_16", + "mm_teleporter", + "yellow teleporter (337.5\xb0)" + }, + { + "mm_teleporter_green_1", + "mm_teleporter", + "green teleporter (0\xb0)" + }, + { + "mm_teleporter_green_2", + "mm_teleporter", + "green teleporter (22.5\xb0)" + }, + { + "mm_teleporter_green_3", + "mm_teleporter", + "green teleporter (45\xb0)" + }, + { + "mm_teleporter_green_4", + "mm_teleporter", + "green teleporter (67.5\xb0)" + }, + { + "mm_teleporter_green_5", + "mm_teleporter", + "green teleporter (90\xb0)" + }, + { + "mm_teleporter_green_6", + "mm_teleporter", + "green teleporter (112.5\xb0)" + }, + { + "mm_teleporter_green_7", + "mm_teleporter", + "green teleporter (135\xb0)" + }, + { + "mm_teleporter_green_8", + "mm_teleporter", + "green teleporter (157.5\xb0)" + }, + { + "mm_teleporter_green_9", + "mm_teleporter", + "green teleporter (180\xb0)" + }, + { + "mm_teleporter_green_10", + "mm_teleporter", + "green teleporter (202.5\xb0)" + }, + { + "mm_teleporter_green_11", + "mm_teleporter", + "green teleporter (225\xb0)" + }, + { + "mm_teleporter_green_12", + "mm_teleporter", + "green teleporter (247.5\xb0)" + }, + { + "mm_teleporter_green_13", + "mm_teleporter", + "green teleporter (270\xb0)" + }, + { + "mm_teleporter_green_14", + "mm_teleporter", + "green teleporter (292.5\xb0)" + }, + { + "mm_teleporter_green_15", + "mm_teleporter", + "green teleporter (315\xb0)" + }, + { + "mm_teleporter_green_16", + "mm_teleporter", + "green teleporter (337.5\xb0)" + }, + { + "mm_teleporter_blue_1", + "mm_teleporter", + "blue teleporter (0\xb0)" + }, + { + "mm_teleporter_blue_2", + "mm_teleporter", + "blue teleporter (22.5\xb0)" + }, + { + "mm_teleporter_blue_3", + "mm_teleporter", + "blue teleporter (45\xb0)" + }, + { + "mm_teleporter_blue_4", + "mm_teleporter", + "blue teleporter (67.5\xb0)" + }, + { + "mm_teleporter_blue_5", + "mm_teleporter", + "blue teleporter (90\xb0)" + }, + { + "mm_teleporter_blue_6", + "mm_teleporter", + "blue teleporter (112.5\xb0)" + }, + { + "mm_teleporter_blue_7", + "mm_teleporter", + "blue teleporter (135\xb0)" + }, + { + "mm_teleporter_blue_8", + "mm_teleporter", + "blue teleporter (157.5\xb0)" + }, + { + "mm_teleporter_blue_9", + "mm_teleporter", + "blue teleporter (180\xb0)" + }, + { + "mm_teleporter_blue_10", + "mm_teleporter", + "blue teleporter (202.5\xb0)" + }, + { + "mm_teleporter_blue_11", + "mm_teleporter", + "blue teleporter (225\xb0)" + }, + { + "mm_teleporter_blue_12", + "mm_teleporter", + "blue teleporter (247.5\xb0)" + }, + { + "mm_teleporter_blue_13", + "mm_teleporter", + "blue teleporter (270\xb0)" + }, + { + "mm_teleporter_blue_14", + "mm_teleporter", + "blue teleporter (292.5\xb0)" + }, + { + "mm_teleporter_blue_15", + "mm_teleporter", + "blue teleporter (315\xb0)" + }, + { + "mm_teleporter_blue_16", + "mm_teleporter", + "blue teleporter (337.5\xb0)" + }, + { + "mm_mcduffin", + "mm_mcduffin", + "Gregor McDuffin" + }, + { + "mm_pacman", + "mm_pacman", + "pac man (MM style)" + }, + { + "mm_fuse", + "mm_fuse", + "fuse (off)", + }, + { + "mm_steel_wall", + "mm_steel_wall", + "steel wall", + }, + { + "mm_wooden_wall", + "mm_wooden_wall", + "wooden wall", + }, + { + "mm_ice_wall", + "mm_ice_wall", + "ice wall", + }, + { + "mm_amoeba_wall", + "mm_amoeba_wall", + "amoeba wall", + }, + { + "df_laser", + "df_laser", + "laser cannon" + }, + { + "df_receiver", + "df_receiver", + "laser receiver" + }, + { + "df_steel_wall", + "df_steel_wall", + "steel wall (DF style)", + }, + { + "df_wooden_wall", + "df_wooden_wall", + "wooden wall (DF style)", + }, + + // -------------------------------------------------------------------------- + // "real" (and therefore drawable) runtime elements + // -------------------------------------------------------------------------- + + { + "dynabomb_player_1.active", + "dynabomb", + "-" + }, + { + "dynabomb_player_2.active", + "dynabomb", + "-" + }, + { + "dynabomb_player_3.active", + "dynabomb", + "-" + }, + { + "dynabomb_player_4.active", + "dynabomb", + "-" + }, + { + "sp_disk_red.active", + "dynamite", + "-" + }, + { + "switchgate.opening", + "switchgate", + "-" + }, + { + "switchgate.closing", + "switchgate", + "-" + }, + { + "timegate.opening", + "timegate", + "-" + }, + { + "timegate.closing", + "timegate", + "-" + }, + { + "pearl.breaking", + "pearl", + "-" + }, + { + "trap.active", + "trap", + "-" + }, + { + "invisible_steelwall.active", + "steelwall", + "-" + }, + { + "invisible_wall.active", + "wall", + "-" + }, + { + "invisible_sand.active", + "sand", + "-" + }, + { + "conveyor_belt_1_left.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_1_middle.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_1_right.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_2_left.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_2_middle.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_2_right.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_3_left.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_3_middle.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_3_right.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_4_left.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_4_middle.active", + "conveyor_belt", + "-" + }, + { + "conveyor_belt_4_right.active", + "conveyor_belt", + "-" + }, + { + "exit.opening", + "exit", + "-" + }, + { + "exit.closing", + "exit", + "-" + }, + { + "steel_exit.opening", + "steel_exit", + "-" + }, + { + "steel_exit.closing", + "steel_exit", + "-" + }, + { + "em_exit.opening", + "em_exit", + "-" + }, + { + "em_exit.closing", + "em_exit", + "-" + }, + { + "em_steel_exit.opening", + "em_steel_exit", + "-" + }, + { + "em_steel_exit.closing", + "em_steel_exit", + "-" + }, + { + "sp_exit.opening", + "sp_exit", + "-" + }, + { + "sp_exit.closing", + "sp_exit", + "-" + }, + { + "sp_exit_open", + "sp_exit", + "-" + }, + { + "sp_terminal.active", + "sp_terminal", + "-" + }, + { + "sp_buggy_base.activating", + "sp_buggy_base", + "-" + }, + { + "sp_buggy_base.active", + "sp_buggy_base", + "-" + }, + { + "sp_murphy_clone", + "murphy_clone", + "-" + }, + { + "amoeba.dropping", + "amoeba", + "-" + }, + { + "quicksand.emptying", + "quicksand", + "-" + }, + { + "quicksand_fast.emptying", + "quicksand", + "-" + }, + { + "magic_wall.active", + "magic_wall", + "-" + }, + { + "bd_magic_wall.active", + "magic_wall", + "-" + }, + { + "dc_magic_wall.active", + "magic_wall", + "-" + }, + { + "magic_wall_full", + "magic_wall", + "-" + }, + { + "bd_magic_wall_full", + "magic_wall", + "-" + }, + { + "dc_magic_wall_full", + "magic_wall", + "-" + }, + { + "magic_wall.emptying", + "magic_wall", + "-" + }, + { + "bd_magic_wall.emptying", + "magic_wall", + "-" + }, + { + "dc_magic_wall.emptying", + "magic_wall", + "-" + }, + { + "magic_wall_dead", + "magic_wall", + "-" + }, + { + "bd_magic_wall_dead", + "magic_wall", + "-" + }, + { + "dc_magic_wall_dead", + "magic_wall", + "-" + }, + + { + "emc_fake_grass.active", + "fake_grass", + "-" + }, + { + "gate_1_gray.active", + "gate", + "" + }, + { + "gate_2_gray.active", + "gate", + "" + }, + { + "gate_3_gray.active", + "gate", + "" + }, + { + "gate_4_gray.active", + "gate", + "" + }, + { + "em_gate_1_gray.active", + "gate", + "" + }, + { + "em_gate_2_gray.active", + "gate", + "" + }, + { + "em_gate_3_gray.active", + "gate", + "" + }, + { + "em_gate_4_gray.active", + "gate", + "" + }, + { + "emc_gate_5_gray.active", + "gate", + "", + }, + { + "emc_gate_6_gray.active", + "gate", + "", + }, + { + "emc_gate_7_gray.active", + "gate", + "", + }, + { + "emc_gate_8_gray.active", + "gate", + "", + }, + { + "dc_gate_white_gray.active", + "gate", + "", + }, + { + "emc_dripper.active", + "dripper", + "dripper" + }, + { + "emc_spring_bumper.active", + "emc_spring_bumper", + "spring bumper", + }, + { + "mm_exit.opening", + "mm_exit", + "-" + }, + { + "mm_exit.closing", + "mm_exit", + "-" + }, + { + "mm_gray_ball.opening", + "mm_gray_ball", + "-", + }, + { + "mm_ice_wall.shrinking", + "mm_ice_wall", + "-", + }, + { + "mm_amoeba_wall.growing", + "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 + // -------------------------------------------------------------------------- + + { + "blocked", + "-", + "-" + }, + { + "explosion", + "-", + "-" + }, + { + "nut.breaking", + "-", + "-" + }, + { + "diamond.breaking", + "-", + "-" + }, + { + "acid_splash_left", "-", "-" }, @@ -5006,9 +6801,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "-" }, - /* ----------------------------------------------------------------------- */ - /* dummy elements (never used as game elements, only used as graphics) */ - /* ----------------------------------------------------------------------- */ + // -------------------------------------------------------------------------- + // dummy elements (never used as game elements, only used as graphics) + // -------------------------------------------------------------------------- { "steelwall_topleft", @@ -5115,6 +6910,71 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "amoeba", "-" }, + { + "mm_lightball_red", + "-", + "-" + }, + { + "mm_lightball_blue", + "-", + "-" + }, + { + "mm_lightball_yellow", + "-", + "-" + }, + { + "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", @@ -5135,6 +6995,11 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "sb_default", "-" }, + { + "[mm_default]", + "mm_default", + "-" + }, { "graphic_1", "graphic", @@ -5275,6 +7140,26 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "internal", "hide DX Boulderdash elements" }, + { + "internal_cascade_mm", + "internal", + "show Mirror Magic elements" + }, + { + "internal_cascade_mm.active", + "internal", + "hide Mirror Magic elements" + }, + { + "internal_cascade_df", + "internal", + "show Deflektor elements" + }, + { + "internal_cascade_df.active", + "internal", + "hide Deflektor elements" + }, { "internal_cascade_chars", "internal", @@ -5346,7 +7231,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "hide elements used in this level" }, - /* keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! */ + // keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! { NULL, @@ -5356,9 +7241,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = }; -/* ------------------------------------------------------------------------- */ -/* element action and direction definitions */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// element action and direction definitions +// ---------------------------------------------------------------------------- struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] = { @@ -5414,6 +7299,7 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] = { ".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 }, @@ -5480,7 +7366,7 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] = { ".part_32", ACTION_PART_32, FALSE }, { ".other", ACTION_OTHER, FALSE }, - /* empty suffix always matches -- check as last entry in InitSoundInfo() */ + // empty suffix always matches -- check as last entry in InitSoundInfo() { "", ACTION_DEFAULT, TRUE }, { NULL, 0, 0 } @@ -5536,25 +7422,26 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] = { ".TOONS", GFX_SPECIAL_ARG_TOONS, }, { ".SCORESOLD", GFX_SPECIAL_ARG_SCORESOLD, }, { ".SCORESNEW", GFX_SPECIAL_ARG_SCORESNEW, }, + { ".NO_TITLE", GFX_SPECIAL_ARG_NO_TITLE, }, { ".FADING", GFX_SPECIAL_ARG_FADING, }, { ".QUIT", GFX_SPECIAL_ARG_QUIT, }, - /* empty suffix always matches -- check as last entry in InitMusicInfo() */ + // empty suffix always matches -- check as last entry in InitMusicInfo() { "", GFX_SPECIAL_ARG_DEFAULT, }, { NULL, 0, } }; -#include "conf_var.c" /* include auto-generated data structure definitions */ +#include "conf_var.c" // include auto-generated data structure definitions -/* ------------------------------------------------------------------------- */ -/* font definitions */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// font definitions +// ---------------------------------------------------------------------------- -/* Important: When one entry is a prefix of another entry, the longer entry - must come first, because the dynamic configuration does prefix matching! - (These definitions must match the corresponding definitions in "main.h"!) */ +// Important: When one entry is a prefix of another entry, the longer entry +// must come first, because the dynamic configuration does prefix matching! +// (These definitions must match the corresponding definitions in "main.h"!) struct FontInfo font_info[NUM_FONTS + 1] = { @@ -5591,6 +7478,7 @@ struct FontInfo font_info[NUM_FONTS + 1] = { "font.option_on" }, { "font.value_1" }, { "font.value_2" }, + { "font.value_old_narrow" }, { "font.value_old" }, { "font.value_narrow" }, { "font.level_number.active" }, @@ -5599,16 +7487,17 @@ struct FontInfo font_info[NUM_FONTS + 1] = { "font.game_info" }, { "font.info.elements" }, { "font.info.levelset" }, + { "font.main.network_players" }, { NULL } }; struct GlobalAnimInfo global_anim_info[NUM_GLOBAL_ANIM_TOKENS + 1]; -/* this contains predefined structure elements to init "global_anim_info" */ +// this contains predefined structure elements to init "global_anim_info" struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] = { - /* (real) graphic definitions used to define animation graphics */ + // (real) graphic definitions used to define animation graphics { "gfx.global.anim_1", }, { "gfx.global.anim_2", }, { "gfx.global.anim_3", }, @@ -5642,7 +7531,7 @@ struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] = { "gfx.global.anim_31", }, { "gfx.global.anim_32", }, - /* (dummy) graphic definitions used to define animation controls */ + // (dummy) graphic definitions used to define animation controls { "global.anim_1", }, { "global.anim_2", }, { "global.anim_3", }, @@ -5680,9 +7569,9 @@ struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] = }; -/* ------------------------------------------------------------------------- */ -/* music token prefix definitions */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// music token prefix definitions +// ---------------------------------------------------------------------------- struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] = { @@ -5692,11 +7581,11 @@ struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] = }; -/* ========================================================================= */ -/* main() */ -/* ========================================================================= */ +// ============================================================================ +// main() +// ============================================================================ -static void print_usage() +static void print_usage(void) { Print("\n" "Usage: %s [OPTION]... [HOSTNAME [PORT]]\n" @@ -5735,15 +7624,22 @@ static void print_usage() program.command_basename); } -static void print_version() +static void print_version(void) { - Print("%s %d.%d.%d.%d%s\n", - PROGRAM_TITLE_STRING, - PROGRAM_VERSION_MAJOR, - PROGRAM_VERSION_MINOR, - PROGRAM_VERSION_PATCH, - PROGRAM_VERSION_BUILD, - PROGRAM_VERSION_EXTRA); + Print("%s", getProgramInitString()); + + if (!strEqual(getProgramVersionString(), getProgramRealVersionString())) + { + Print(" (%s %d.%d.%d.%d%s)", + PROGRAM_TITLE_STRING, + PROGRAM_VERSION_SUPER, + PROGRAM_VERSION_MAJOR, + PROGRAM_VERSION_MINOR, + PROGRAM_VERSION_PATCH, + PROGRAM_VERSION_EXTRA); + } + + Print("\n"); if (options.debug) { @@ -5779,6 +7675,7 @@ static void InitProgramConfig(char *command_filename) { char *program_title = PROGRAM_TITLE_STRING; char *program_icon_file = PROGRAM_ICON_FILENAME; + char *program_version = getProgramRealVersionString(); char *config_filename = getProgramConfigFilename(command_filename); char *userdata_basename = getBaseNameNoSuffix(command_filename); char *userdata_subdir; @@ -5788,10 +7685,14 @@ static void InitProgramConfig(char *command_filename) 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); } @@ -5804,6 +7705,11 @@ static void InitProgramConfig(char *command_filename) strlen(setup.internal.program_title) > 0) program_title = getStringCopy(setup.internal.program_title); + // set program version from potentially redefined program version + if (setup.internal.program_version != NULL && + strlen(setup.internal.program_version) > 0) + program_version = getStringCopy(setup.internal.program_version); + // set program icon file from potentially redefined program icon file if (setup.internal.program_icon_file != NULL && strlen(setup.internal.program_icon_file) > 0) @@ -5832,6 +7738,7 @@ static void InitProgramConfig(char *command_filename) program_title, program_icon_file, COOKIE_PREFIX, + program_version, GAME_VERSION_ACTUAL); } @@ -5850,5 +7757,5 @@ int main(int argc, char *argv[]) EventLoop(); CloseAllAndExit(0); - return 0; /* to keep compilers happy */ + return 0; // to keep compilers happy }