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];
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];
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",
"letter ''"
},
{
- "char_unused",
+ "char_button",
"char",
"letter 'button'"
},
{
- "char_unused",
+ "char_up",
"char",
"letter 'up'"
},
{
- "char_unused",
+ "char_down",
"char",
"letter 'down'"
},
"steel letter ''"
},
{
- "steel_char_unused",
+ "steel_char_button",
"steel_char",
"steel letter 'button'"
},
{
- "steel_char_unused",
+ "steel_char_up",
"steel_char",
"steel letter 'up'"
},
{
- "steel_char_unused",
+ "steel_char_down",
"steel_char",
"steel letter 'down'"
},
{
"mm_empty_space",
"empty_space",
- "empty_space"
+ "empty space"
},
{
"mm_mirror_1",
{
"mm_steel_grid_fixed_1",
"mm_steel_grid_fixed",
- "fixed steel polarisator (0\xb0)"
+ "fixed steel polarizer (0\xb0)"
},
{
"mm_steel_grid_fixed_2",
"mm_steel_grid_fixed",
- "fixed steel polarisator (90\xb0)"
+ "fixed steel polarizer (90\xb0)"
},
{
"mm_steel_grid_fixed_3",
"mm_steel_grid_fixed",
- "fixed steel polarisator (45\xb0)"
+ "fixed steel polarizer (45\xb0)"
},
{
"mm_steel_grid_fixed_4",
"mm_steel_grid_fixed",
- "fixed steel polarisator (135\xb0)"
+ "fixed steel polarizer (135\xb0)"
},
{
"mm_mcduffin.right",
"gray ball"
},
{
- "mm_beamer_1",
- "mm_beamer",
- "beamer (0\xb0)"
+ "mm_teleporter_1",
+ "mm_teleporter",
+ "teleporter (0\xb0)"
},
{
- "mm_beamer_2",
- "mm_beamer",
- "beamer (22.5\xb0)"
+ "mm_teleporter_2",
+ "mm_teleporter",
+ "teleporter (22.5\xb0)"
},
{
- "mm_beamer_3",
- "mm_beamer",
- "beamer (45\xb0)"
+ "mm_teleporter_3",
+ "mm_teleporter",
+ "teleporter (45\xb0)"
},
{
- "mm_beamer_4",
- "mm_beamer",
- "beamer (67.5\xb0)"
+ "mm_teleporter_4",
+ "mm_teleporter",
+ "teleporter (67.5\xb0)"
},
{
- "mm_beamer_5",
- "mm_beamer",
- "beamer (90\xb0)"
+ "mm_teleporter_5",
+ "mm_teleporter",
+ "teleporter (90\xb0)"
},
{
- "mm_beamer_6",
- "mm_beamer",
- "beamer (112.5\xb0)"
+ "mm_teleporter_6",
+ "mm_teleporter",
+ "teleporter (112.5\xb0)"
},
{
- "mm_beamer_7",
- "mm_beamer",
- "beamer (135\xb0)"
+ "mm_teleporter_7",
+ "mm_teleporter",
+ "teleporter (135\xb0)"
},
{
- "mm_beamer_8",
- "mm_beamer",
- "beamer (157.5\xb0)"
+ "mm_teleporter_8",
+ "mm_teleporter",
+ "teleporter (157.5\xb0)"
},
{
- "mm_beamer_9",
- "mm_beamer",
- "beamer (180\xb0)"
+ "mm_teleporter_9",
+ "mm_teleporter",
+ "teleporter (180\xb0)"
},
{
- "mm_beamer_10",
- "mm_beamer",
- "beamer (202.5\xb0)"
+ "mm_teleporter_10",
+ "mm_teleporter",
+ "teleporter (202.5\xb0)"
},
{
- "mm_beamer_11",
- "mm_beamer",
- "beamer (225\xb0)"
+ "mm_teleporter_11",
+ "mm_teleporter",
+ "teleporter (225\xb0)"
},
{
- "mm_beamer_12",
- "mm_beamer",
- "beamer (247.5\xb0)"
+ "mm_teleporter_12",
+ "mm_teleporter",
+ "teleporter (247.5\xb0)"
},
{
- "mm_beamer_13",
- "mm_beamer",
- "beamer (270\xb0)"
+ "mm_teleporter_13",
+ "mm_teleporter",
+ "teleporter (270\xb0)"
},
{
- "mm_beamer_14",
- "mm_beamer",
- "beamer (292.5\xb0)"
+ "mm_teleporter_14",
+ "mm_teleporter",
+ "teleporter (292.5\xb0)"
},
{
- "mm_beamer_15",
- "mm_beamer",
- "beamer (315\xb0)"
+ "mm_teleporter_15",
+ "mm_teleporter",
+ "teleporter (315\xb0)"
},
{
- "mm_beamer_16",
- "mm_beamer",
- "beamer (337.5\xb0)"
+ "mm_teleporter_16",
+ "mm_teleporter",
+ "teleporter (337.5\xb0)"
},
{
"mm_fuse.active",
"pac man (starts moving down)"
},
{
- "mm_polarisator_1",
- "mm_polarisator",
- "polarisator (0\xb0)"
+ "mm_polarizer_1",
+ "mm_polarizer",
+ "polarizer (0\xb0)"
},
{
- "mm_polarisator_2",
- "mm_polarisator",
- "polarisator (11.25\xb0)"
+ "mm_polarizer_2",
+ "mm_polarizer",
+ "polarizer (11.25\xb0)"
},
{
- "mm_polarisator_3",
- "mm_polarisator",
- "polarisator (22.5\xb0)"
+ "mm_polarizer_3",
+ "mm_polarizer",
+ "polarizer (22.5\xb0)"
},
{
- "mm_polarisator_4",
- "mm_polarisator",
- "polarisator (33.75\xb0)"
+ "mm_polarizer_4",
+ "mm_polarizer",
+ "polarizer (33.75\xb0)"
},
{
- "mm_polarisator_5",
- "mm_polarisator",
- "polarisator (45\xb0)"
+ "mm_polarizer_5",
+ "mm_polarizer",
+ "polarizer (45\xb0)"
},
{
- "mm_polarisator_6",
- "mm_polarisator",
- "polarisator (56.25\xb0)"
+ "mm_polarizer_6",
+ "mm_polarizer",
+ "polarizer (56.25\xb0)"
},
{
- "mm_polarisator_7",
- "mm_polarisator",
- "polarisator (67.5\xb0)"
+ "mm_polarizer_7",
+ "mm_polarizer",
+ "polarizer (67.5\xb0)"
},
{
- "mm_polarisator_8",
- "mm_polarisator",
- "polarisator (78.75\xb0)"
+ "mm_polarizer_8",
+ "mm_polarizer",
+ "polarizer (78.75\xb0)"
},
{
- "mm_polarisator_9",
- "mm_polarisator",
- "polarisator (90\xb0)"
+ "mm_polarizer_9",
+ "mm_polarizer",
+ "polarizer (90\xb0)"
},
{
- "mm_polarisator_10",
- "mm_polarisator",
- "polarisator (101.25\xb0)"
+ "mm_polarizer_10",
+ "mm_polarizer",
+ "polarizer (101.25\xb0)"
},
{
- "mm_polarisator_11",
- "mm_polarisator",
- "polarisator (112.5\xb0)"
+ "mm_polarizer_11",
+ "mm_polarizer",
+ "polarizer (112.5\xb0)"
},
{
- "mm_polarisator_12",
- "mm_polarisator",
- "polarisator (123.75\xb0)"
+ "mm_polarizer_12",
+ "mm_polarizer",
+ "polarizer (123.75\xb0)"
},
{
- "mm_polarisator_13",
- "mm_polarisator",
- "polarisator (135\xb0)"
+ "mm_polarizer_13",
+ "mm_polarizer",
+ "polarizer (135\xb0)"
},
{
- "mm_polarisator_14",
- "mm_polarisator",
- "polarisator (146.25\xb0)"
+ "mm_polarizer_14",
+ "mm_polarizer",
+ "polarizer (146.25\xb0)"
},
{
- "mm_polarisator_15",
- "mm_polarisator",
- "polarisator (157.5\xb0)"
+ "mm_polarizer_15",
+ "mm_polarizer",
+ "polarizer (157.5\xb0)"
},
{
- "mm_polarisator_16",
- "mm_polarisator",
- "polarisator (168.75\xb0)"
+ "mm_polarizer_16",
+ "mm_polarizer",
+ "polarizer (168.75\xb0)"
},
{
- "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)"
},
{
"mm_mirror_fixed_1",
{
"mm_lightbulb.active",
"mm_lightbulb",
- "ligh bulb (on)"
+ "light bulb (on)"
},
{
"mm_lightball",
{
"mm_wooden_grid_fixed_1",
"mm_wooden_grid_fixed",
- "fixed wooden polarisator (0\xb0)"
+ "fixed wooden polarizer (0\xb0)"
},
{
"mm_wooden_grid_fixed_2",
"mm_wooden_grid_fixed",
- "fixed wooden polarisator (90\xb0)"
+ "fixed wooden polarizer (90\xb0)"
},
{
"mm_wooden_grid_fixed_3",
"mm_wooden_grid_fixed",
- "fixed wooden polarisator (45\xb0)"
+ "fixed wooden polarizer (45\xb0)"
},
{
"mm_wooden_grid_fixed_4",
"mm_wooden_grid_fixed",
- "fixed wooden polarisator (135\xb0)"
+ "fixed wooden polarizer (135\xb0)"
},
{
"mm_fuel_empty",
{
"df_wooden_grid_fixed_1",
"df_wooden_grid_fixed",
- "fixed wooden polarisator (0\xb0)"
+ "fixed wooden polarizer (0\xb0)"
},
{
"df_wooden_grid_fixed_2",
"df_wooden_grid_fixed",
- "fixed wooden polarisator (22.5\xb0)"
+ "fixed wooden polarizer (22.5\xb0)"
},
{
"df_wooden_grid_fixed_3",
"df_wooden_grid_fixed",
- "fixed wooden polarisator (45\xb0)"
+ "fixed wooden polarizer (45\xb0)"
},
{
"df_wooden_grid_fixed_4",
"df_wooden_grid_fixed",
- "fixed wooden polarisator (67.5\xb0)"
+ "fixed wooden polarizer (67.5\xb0)"
},
{
"df_wooden_grid_fixed_5",
"df_wooden_grid_fixed",
- "fixed wooden polarisator (90\xb0)"
+ "fixed wooden polarizer (90\xb0)"
},
{
"df_wooden_grid_fixed_6",
"df_wooden_grid_fixed",
- "fixed wooden polarisator (112.5\xb0)"
+ "fixed wooden polarizer (112.5\xb0)"
},
{
"df_wooden_grid_fixed_7",
"df_wooden_grid_fixed",
- "fixed wooden polarisator (135\xb0)"
+ "fixed wooden polarizer (135\xb0)"
},
{
"df_wooden_grid_fixed_8",
"df_wooden_grid_fixed",
- "fixed wooden polarisator (157.5\xb0)"
+ "fixed wooden polarizer (157.5\xb0)"
},
{
"df_steel_grid_fixed_1",
"df_steel_grid_fixed",
- "fixed steel polarisator (0\xb0)"
+ "fixed steel polarizer (0\xb0)"
},
{
"df_steel_grid_fixed_2",
"df_steel_grid_fixed",
- "fixed steel polarisator (22.5\xb0)"
+ "fixed steel polarizer (22.5\xb0)"
},
{
"df_steel_grid_fixed_3",
"df_steel_grid_fixed",
- "fixed steel polarisator (45\xb0)"
+ "fixed steel polarizer (45\xb0)"
},
{
"df_steel_grid_fixed_4",
"df_steel_grid_fixed",
- "fixed steel polarisator (67.5\xb0)"
+ "fixed steel polarizer (67.5\xb0)"
},
{
"df_steel_grid_fixed_5",
"df_steel_grid_fixed",
- "fixed steel polarisator (90\xb0)"
+ "fixed steel polarizer (90\xb0)"
},
{
"df_steel_grid_fixed_6",
"df_steel_grid_fixed",
- "fixed steel polarisator (112.5\xb0)"
+ "fixed steel polarizer (112.5\xb0)"
},
{
"df_steel_grid_fixed_7",
"df_steel_grid_fixed",
- "fixed steel polarisator (135\xb0)"
+ "fixed steel polarizer (135\xb0)"
},
{
"df_steel_grid_fixed_8",
"df_steel_grid_fixed",
- "fixed steel polarisator (157.5\xb0)"
+ "fixed steel polarizer (157.5\xb0)"
},
{
"df_wooden_wall_1",
{
"df_empty_space",
"empty_space",
- "empty_space"
+ "empty space"
},
{
"df_cell",
{
"df_wooden_grid_rotating_1",
"df_wooden_grid_rotating",
- "rotating wooden polarisator (0\xb0)"
+ "rotating wooden polarizer (0\xb0)"
},
{
"df_wooden_grid_rotating_2",
"df_wooden_grid_rotating",
- "rotating wooden polarisator (22.5\xb0)"
+ "rotating wooden polarizer (22.5\xb0)"
},
{
"df_wooden_grid_rotating_3",
"df_wooden_grid_rotating",
- "rotating wooden polarisator (45\xb0)"
+ "rotating wooden polarizer (45\xb0)"
},
{
"df_wooden_grid_rotating_4",
"df_wooden_grid_rotating",
- "rotating wooden polarisator (67.5\xb0)"
+ "rotating wooden polarizer (67.5\xb0)"
},
{
"df_wooden_grid_rotating_5",
"df_wooden_grid_rotating",
- "rotating wooden polarisator (90\xb0)"
+ "rotating wooden polarizer (90\xb0)"
},
{
"df_wooden_grid_rotating_6",
"df_wooden_grid_rotating",
- "rotating wooden polarisator (112.5\xb0)"
+ "rotating wooden polarizer (112.5\xb0)"
},
{
"df_wooden_grid_rotating_7",
"df_wooden_grid_rotating",
- "rotating wooden polarisator (135\xb0)"
+ "rotating wooden polarizer (135\xb0)"
},
{
"df_wooden_grid_rotating_8",
"df_wooden_grid_rotating",
- "rotating wooden polarisator (157.5\xb0)"
+ "rotating wooden polarizer (157.5\xb0)"
},
{
"df_steel_grid_rotating_1",
"df_steel_grid_rotating",
- "rotating steel polarisator (0\xb0)"
+ "rotating steel polarizer (0\xb0)"
},
{
"df_steel_grid_rotating_2",
"df_steel_grid_rotating",
- "rotating steel polarisator (22.5\xb0)"
+ "rotating steel polarizer (22.5\xb0)"
},
{
"df_steel_grid_rotating_3",
"df_steel_grid_rotating",
- "rotating steel polarisator (45\xb0)"
+ "rotating steel polarizer (45\xb0)"
},
{
"df_steel_grid_rotating_4",
"df_steel_grid_rotating",
- "rotating steel polarisator (67.5\xb0)"
+ "rotating steel polarizer (67.5\xb0)"
},
{
"df_steel_grid_rotating_5",
"df_steel_grid_rotating",
- "rotating steel polarisator (90\xb0)"
+ "rotating steel polarizer (90\xb0)"
},
{
"df_steel_grid_rotating_6",
"df_steel_grid_rotating",
- "rotating steel polarisator (112.5\xb0)"
+ "rotating steel polarizer (112.5\xb0)"
},
{
"df_steel_grid_rotating_7",
"df_steel_grid_rotating",
- "rotating steel polarisator (135\xb0)"
+ "rotating steel polarizer (135\xb0)"
},
{
"df_steel_grid_rotating_8",
"df_steel_grid_rotating",
- "rotating steel polarisator (157.5\xb0)"
+ "rotating steel polarizer (157.5\xb0)"
},
{
- "mm_beamer_red_1",
- "mm_beamer",
- "red beamer (0\xb0)"
+ "mm_teleporter_red_1",
+ "mm_teleporter",
+ "red teleporter (0\xb0)"
},
{
- "mm_beamer_red_2",
- "mm_beamer",
- "red beamer (22.5\xb0)"
+ "mm_teleporter_red_2",
+ "mm_teleporter",
+ "red teleporter (22.5\xb0)"
},
{
- "mm_beamer_red_3",
- "mm_beamer",
- "red beamer (45\xb0)"
+ "mm_teleporter_red_3",
+ "mm_teleporter",
+ "red teleporter (45\xb0)"
},
{
- "mm_beamer_red_4",
- "mm_beamer",
- "red beamer (67.5\xb0)"
+ "mm_teleporter_red_4",
+ "mm_teleporter",
+ "red teleporter (67.5\xb0)"
},
{
- "mm_beamer_red_5",
- "mm_beamer",
- "red beamer (90\xb0)"
+ "mm_teleporter_red_5",
+ "mm_teleporter",
+ "red teleporter (90\xb0)"
},
{
- "mm_beamer_red_6",
- "mm_beamer",
- "red beamer (112.5\xb0)"
+ "mm_teleporter_red_6",
+ "mm_teleporter",
+ "red teleporter (112.5\xb0)"
},
{
- "mm_beamer_red_7",
- "mm_beamer",
- "red beamer (135\xb0)"
+ "mm_teleporter_red_7",
+ "mm_teleporter",
+ "red teleporter (135\xb0)"
},
{
- "mm_beamer_red_8",
- "mm_beamer",
- "red beamer (157.5\xb0)"
+ "mm_teleporter_red_8",
+ "mm_teleporter",
+ "red teleporter (157.5\xb0)"
},
{
- "mm_beamer_red_9",
- "mm_beamer",
- "red beamer (180\xb0)"
+ "mm_teleporter_red_9",
+ "mm_teleporter",
+ "red teleporter (180\xb0)"
},
{
- "mm_beamer_red_10",
- "mm_beamer",
- "red beamer (202.5\xb0)"
+ "mm_teleporter_red_10",
+ "mm_teleporter",
+ "red teleporter (202.5\xb0)"
},
{
- "mm_beamer_red_11",
- "mm_beamer",
- "red beamer (225\xb0)"
+ "mm_teleporter_red_11",
+ "mm_teleporter",
+ "red teleporter (225\xb0)"
},
{
- "mm_beamer_red_12",
- "mm_beamer",
- "red beamer (247.5\xb0)"
+ "mm_teleporter_red_12",
+ "mm_teleporter",
+ "red teleporter (247.5\xb0)"
},
{
- "mm_beamer_red_13",
- "mm_beamer",
- "red beamer (270\xb0)"
+ "mm_teleporter_red_13",
+ "mm_teleporter",
+ "red teleporter (270\xb0)"
},
{
- "mm_beamer_red_14",
- "mm_beamer",
- "red beamer (292.5\xb0)"
+ "mm_teleporter_red_14",
+ "mm_teleporter",
+ "red teleporter (292.5\xb0)"
},
{
- "mm_beamer_red_15",
- "mm_beamer",
- "red beamer (315\xb0)"
+ "mm_teleporter_red_15",
+ "mm_teleporter",
+ "red teleporter (315\xb0)"
},
{
- "mm_beamer_red_16",
- "mm_beamer",
- "red beamer (337.5\xb0)"
+ "mm_teleporter_red_16",
+ "mm_teleporter",
+ "red teleporter (337.5\xb0)"
},
{
- "mm_beamer_yellow_1",
- "mm_beamer",
- "yellow beamer (0\xb0)"
+ "mm_teleporter_yellow_1",
+ "mm_teleporter",
+ "yellow teleporter (0\xb0)"
},
{
- "mm_beamer_yellow_2",
- "mm_beamer",
- "yellow beamer (22.5\xb0)"
+ "mm_teleporter_yellow_2",
+ "mm_teleporter",
+ "yellow teleporter (22.5\xb0)"
},
{
- "mm_beamer_yellow_3",
- "mm_beamer",
- "yellow beamer (45\xb0)"
+ "mm_teleporter_yellow_3",
+ "mm_teleporter",
+ "yellow teleporter (45\xb0)"
},
{
- "mm_beamer_yellow_4",
- "mm_beamer",
- "yellow beamer (67.5\xb0)"
+ "mm_teleporter_yellow_4",
+ "mm_teleporter",
+ "yellow teleporter (67.5\xb0)"
},
{
- "mm_beamer_yellow_5",
- "mm_beamer",
- "yellow beamer (90\xb0)"
+ "mm_teleporter_yellow_5",
+ "mm_teleporter",
+ "yellow teleporter (90\xb0)"
},
{
- "mm_beamer_yellow_6",
- "mm_beamer",
- "yellow beamer (112.5\xb0)"
+ "mm_teleporter_yellow_6",
+ "mm_teleporter",
+ "yellow teleporter (112.5\xb0)"
},
{
- "mm_beamer_yellow_7",
- "mm_beamer",
- "yellow beamer (135\xb0)"
+ "mm_teleporter_yellow_7",
+ "mm_teleporter",
+ "yellow teleporter (135\xb0)"
},
{
- "mm_beamer_yellow_8",
- "mm_beamer",
- "yellow beamer (157.5\xb0)"
+ "mm_teleporter_yellow_8",
+ "mm_teleporter",
+ "yellow teleporter (157.5\xb0)"
},
{
- "mm_beamer_yellow_9",
- "mm_beamer",
- "yellow beamer (180\xb0)"
+ "mm_teleporter_yellow_9",
+ "mm_teleporter",
+ "yellow teleporter (180\xb0)"
},
{
- "mm_beamer_yellow_10",
- "mm_beamer",
- "yellow beamer (202.5\xb0)"
+ "mm_teleporter_yellow_10",
+ "mm_teleporter",
+ "yellow teleporter (202.5\xb0)"
},
{
- "mm_beamer_yellow_11",
- "mm_beamer",
- "yellow beamer (225\xb0)"
+ "mm_teleporter_yellow_11",
+ "mm_teleporter",
+ "yellow teleporter (225\xb0)"
},
{
- "mm_beamer_yellow_12",
- "mm_beamer",
- "yellow beamer (247.5\xb0)"
+ "mm_teleporter_yellow_12",
+ "mm_teleporter",
+ "yellow teleporter (247.5\xb0)"
},
{
- "mm_beamer_yellow_13",
- "mm_beamer",
- "yellow beamer (270\xb0)"
+ "mm_teleporter_yellow_13",
+ "mm_teleporter",
+ "yellow teleporter (270\xb0)"
},
{
- "mm_beamer_yellow_14",
- "mm_beamer",
- "yellow beamer (292.5\xb0)"
+ "mm_teleporter_yellow_14",
+ "mm_teleporter",
+ "yellow teleporter (292.5\xb0)"
},
{
- "mm_beamer_yellow_15",
- "mm_beamer",
- "yellow beamer (315\xb0)"
+ "mm_teleporter_yellow_15",
+ "mm_teleporter",
+ "yellow teleporter (315\xb0)"
},
{
- "mm_beamer_yellow_16",
- "mm_beamer",
- "yellow beamer (337.5\xb0)"
+ "mm_teleporter_yellow_16",
+ "mm_teleporter",
+ "yellow teleporter (337.5\xb0)"
},
{
- "mm_beamer_green_1",
- "mm_beamer",
- "green beamer (0\xb0)"
+ "mm_teleporter_green_1",
+ "mm_teleporter",
+ "green teleporter (0\xb0)"
},
{
- "mm_beamer_green_2",
- "mm_beamer",
- "green beamer (22.5\xb0)"
+ "mm_teleporter_green_2",
+ "mm_teleporter",
+ "green teleporter (22.5\xb0)"
},
{
- "mm_beamer_green_3",
- "mm_beamer",
- "green beamer (45\xb0)"
+ "mm_teleporter_green_3",
+ "mm_teleporter",
+ "green teleporter (45\xb0)"
},
{
- "mm_beamer_green_4",
- "mm_beamer",
- "green beamer (67.5\xb0)"
+ "mm_teleporter_green_4",
+ "mm_teleporter",
+ "green teleporter (67.5\xb0)"
},
{
- "mm_beamer_green_5",
- "mm_beamer",
- "green beamer (90\xb0)"
+ "mm_teleporter_green_5",
+ "mm_teleporter",
+ "green teleporter (90\xb0)"
},
{
- "mm_beamer_green_6",
- "mm_beamer",
- "green beamer (112.5\xb0)"
+ "mm_teleporter_green_6",
+ "mm_teleporter",
+ "green teleporter (112.5\xb0)"
},
{
- "mm_beamer_green_7",
- "mm_beamer",
- "green beamer (135\xb0)"
+ "mm_teleporter_green_7",
+ "mm_teleporter",
+ "green teleporter (135\xb0)"
},
{
- "mm_beamer_green_8",
- "mm_beamer",
- "green beamer (157.5\xb0)"
+ "mm_teleporter_green_8",
+ "mm_teleporter",
+ "green teleporter (157.5\xb0)"
},
{
- "mm_beamer_green_9",
- "mm_beamer",
- "green beamer (180\xb0)"
+ "mm_teleporter_green_9",
+ "mm_teleporter",
+ "green teleporter (180\xb0)"
},
{
- "mm_beamer_green_10",
- "mm_beamer",
- "green beamer (202.5\xb0)"
+ "mm_teleporter_green_10",
+ "mm_teleporter",
+ "green teleporter (202.5\xb0)"
},
{
- "mm_beamer_green_11",
- "mm_beamer",
- "green beamer (225\xb0)"
+ "mm_teleporter_green_11",
+ "mm_teleporter",
+ "green teleporter (225\xb0)"
},
{
- "mm_beamer_green_12",
- "mm_beamer",
- "green beamer (247.5\xb0)"
+ "mm_teleporter_green_12",
+ "mm_teleporter",
+ "green teleporter (247.5\xb0)"
},
{
- "mm_beamer_green_13",
- "mm_beamer",
- "green beamer (270\xb0)"
+ "mm_teleporter_green_13",
+ "mm_teleporter",
+ "green teleporter (270\xb0)"
},
{
- "mm_beamer_green_14",
- "mm_beamer",
- "green beamer (292.5\xb0)"
+ "mm_teleporter_green_14",
+ "mm_teleporter",
+ "green teleporter (292.5\xb0)"
},
{
- "mm_beamer_green_15",
- "mm_beamer",
- "green beamer (315\xb0)"
+ "mm_teleporter_green_15",
+ "mm_teleporter",
+ "green teleporter (315\xb0)"
},
{
- "mm_beamer_green_16",
- "mm_beamer",
- "green beamer (337.5\xb0)"
+ "mm_teleporter_green_16",
+ "mm_teleporter",
+ "green teleporter (337.5\xb0)"
},
{
- "mm_beamer_blue_1",
- "mm_beamer",
- "blue beamer (0\xb0)"
+ "mm_teleporter_blue_1",
+ "mm_teleporter",
+ "blue teleporter (0\xb0)"
},
{
- "mm_beamer_blue_2",
- "mm_beamer",
- "blue beamer (22.5\xb0)"
+ "mm_teleporter_blue_2",
+ "mm_teleporter",
+ "blue teleporter (22.5\xb0)"
},
{
- "mm_beamer_blue_3",
- "mm_beamer",
- "blue beamer (45\xb0)"
+ "mm_teleporter_blue_3",
+ "mm_teleporter",
+ "blue teleporter (45\xb0)"
},
{
- "mm_beamer_blue_4",
- "mm_beamer",
- "blue beamer (67.5\xb0)"
+ "mm_teleporter_blue_4",
+ "mm_teleporter",
+ "blue teleporter (67.5\xb0)"
},
{
- "mm_beamer_blue_5",
- "mm_beamer",
- "blue beamer (90\xb0)"
+ "mm_teleporter_blue_5",
+ "mm_teleporter",
+ "blue teleporter (90\xb0)"
},
{
- "mm_beamer_blue_6",
- "mm_beamer",
- "blue beamer (112.5\xb0)"
+ "mm_teleporter_blue_6",
+ "mm_teleporter",
+ "blue teleporter (112.5\xb0)"
},
{
- "mm_beamer_blue_7",
- "mm_beamer",
- "blue beamer (135\xb0)"
+ "mm_teleporter_blue_7",
+ "mm_teleporter",
+ "blue teleporter (135\xb0)"
},
{
- "mm_beamer_blue_8",
- "mm_beamer",
- "blue beamer (157.5\xb0)"
+ "mm_teleporter_blue_8",
+ "mm_teleporter",
+ "blue teleporter (157.5\xb0)"
},
{
- "mm_beamer_blue_9",
- "mm_beamer",
- "blue beamer (180\xb0)"
+ "mm_teleporter_blue_9",
+ "mm_teleporter",
+ "blue teleporter (180\xb0)"
},
{
- "mm_beamer_blue_10",
- "mm_beamer",
- "blue beamer (202.5\xb0)"
+ "mm_teleporter_blue_10",
+ "mm_teleporter",
+ "blue teleporter (202.5\xb0)"
},
{
- "mm_beamer_blue_11",
- "mm_beamer",
- "blue beamer (225\xb0)"
+ "mm_teleporter_blue_11",
+ "mm_teleporter",
+ "blue teleporter (225\xb0)"
},
{
- "mm_beamer_blue_12",
- "mm_beamer",
- "blue beamer (247.5\xb0)"
+ "mm_teleporter_blue_12",
+ "mm_teleporter",
+ "blue teleporter (247.5\xb0)"
},
{
- "mm_beamer_blue_13",
- "mm_beamer",
- "blue beamer (270\xb0)"
+ "mm_teleporter_blue_13",
+ "mm_teleporter",
+ "blue teleporter (270\xb0)"
},
{
- "mm_beamer_blue_14",
- "mm_beamer",
- "blue beamer (292.5\xb0)"
+ "mm_teleporter_blue_14",
+ "mm_teleporter",
+ "blue teleporter (292.5\xb0)"
},
{
- "mm_beamer_blue_15",
- "mm_beamer",
- "blue beamer (315\xb0)"
+ "mm_teleporter_blue_15",
+ "mm_teleporter",
+ "blue teleporter (315\xb0)"
},
{
- "mm_beamer_blue_16",
- "mm_beamer",
- "blue beamer (337.5\xb0)"
+ "mm_teleporter_blue_16",
+ "mm_teleporter",
+ "blue teleporter (337.5\xb0)"
},
{
"mm_mcduffin",
"wooden wall (DF style)",
},
- /* ----------------------------------------------------------------------- */
- /* "real" (and therefore drawable) runtime elements */
- /* ----------------------------------------------------------------------- */
+ // --------------------------------------------------------------------------
+ // "real" (and therefore drawable) runtime elements
+ // --------------------------------------------------------------------------
{
"dynabomb_player_1.active",
"pac man (eating down)"
},
- /* ----------------------------------------------------------------------- */
- /* "unreal" (and therefore not drawable) runtime elements */
- /* ----------------------------------------------------------------------- */
+ // --------------------------------------------------------------------------
+ // "unreal" (and therefore not drawable) runtime elements
+ // --------------------------------------------------------------------------
{
"blocked",
"-"
},
- /* ----------------------------------------------------------------------- */
- /* dummy elements (never used as game elements, only used as graphics) */
- /* ----------------------------------------------------------------------- */
+ // --------------------------------------------------------------------------
+ // dummy elements (never used as game elements, only used as graphics)
+ // --------------------------------------------------------------------------
{
"steelwall_topleft",
"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,
};
-/* ------------------------------------------------------------------------- */
-/* element action and direction definitions */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// element action and direction definitions
+// ----------------------------------------------------------------------------
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 }
{ ".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] =
{
{ "font.option_on" },
{ "font.value_1" },
{ "font.value_2" },
+ { "font.value_old_narrow" },
{ "font.value_old" },
{ "font.value_narrow" },
{ "font.level_number.active" },
{ "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", },
{ "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", },
{ NULL }
};
+struct GlobalAnimEventInfo global_anim_event_info =
+{
+ NULL, 0
+};
-/* ------------------------------------------------------------------------- */
-/* music token prefix definitions */
-/* ------------------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+// music token prefix definitions
+// ----------------------------------------------------------------------------
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"
program.command_basename);
}
-static void print_version()
+static void print_version(void)
{
Print("%s", getProgramInitString());
{
Print(" (%s %d.%d.%d.%d%s)",
PROGRAM_TITLE_STRING,
+ PROGRAM_VERSION_SUPER,
PROGRAM_VERSION_MAJOR,
PROGRAM_VERSION_MINOR,
PROGRAM_VERSION_PATCH,
- PROGRAM_VERSION_BUILD,
PROGRAM_VERSION_EXTRA);
}
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);
}
EventLoop();
CloseAllAndExit(0);
- return 0; /* to keep compilers happy */
+ return 0; // to keep compilers happy
}