removed unnecessary screen redraws when waiting for events to continue
[rocksndiamonds.git] / src / main.c
index c2e2338da2420fc3c1f460c5cd2660adb452af40..1a4243f98dae958e5ddf865d0e50399c01a7a229 100644 (file)
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //                         Holger Schemel
 //                 info@artsoft.org
-//                 http://www.artsoft.org/
+//                 https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // main.c
 // ============================================================================
@@ -34,14 +34,10 @@ 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                  Tile[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,20 +121,15 @@ 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];
 struct TapeInfo                tape;
-struct SetupInfo       setup;
 struct GameInfo                game;
 struct GlobalInfo      global;
 struct BorderInfo      border;
@@ -186,20 +177,20 @@ 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",
@@ -554,7 +545,8 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "bd_butterfly.right",
     "bd_butterfly",
-    "butterfly (starts moving right)"},
+    "butterfly (starts moving right)"
+  },
   {
     "bd_butterfly.up",
     "bd_butterfly",
@@ -563,11 +555,13 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "bd_butterfly.left",
     "bd_butterfly",
-    "butterfly (starts moving left)"},
+    "butterfly (starts moving left)"
+  },
   {
     "bd_butterfly.down",
     "bd_butterfly",
-    "butterfly (starts moving down)"},
+    "butterfly (starts moving down)"
+  },
   {
     "bd_firefly.right",
     "bd_firefly",
@@ -641,7 +635,8 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "spaceship.right",
     "spaceship",
-    "spaceship (starts moving right)"},
+    "spaceship (starts moving right)"
+  },
   {
     "spaceship.up",
     "spaceship",
@@ -650,11 +645,13 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "spaceship.left",
     "spaceship",
-    "spaceship (starts moving left)"},
+    "spaceship (starts moving left)"
+  },
   {
     "spaceship.down",
     "spaceship",
-    "spaceship (starts moving down)"},
+    "spaceship (starts moving down)"
+  },
   {
     "pacman.right",
     "pacman",
@@ -1181,17 +1178,17 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "letter ''"
   },
   {
-    "char_unused",
+    "char_button",
     "char",
     "letter 'button'"
   },
   {
-    "char_unused",
+    "char_up",
     "char",
     "letter 'up'"
   },
   {
-    "char_unused",
+    "char_down",
     "char",
     "letter 'down'"
   },
@@ -1858,62 +1855,62 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "emc_steelwall_1",
     "steelwall",
-    "steel wall"
+    "steel wall 1 (EMC style)"
   },
   {
     "emc_steelwall_2",
     "steelwall",
-    "steel wall"
+    "steel wall 2 (EMC style)"
   },
   {
     "emc_steelwall_3",
     "steelwall",
-    "steel wall"
+    "steel wall 3 (EMC style)"
   },
   {
     "emc_steelwall_4",
     "steelwall",
-    "steel wall"
+    "steel wall 4 (EMC style)"
   },
   {
     "emc_wall_1",
     "wall",
-    "normal wall"
+    "normal wall 1 (EMC style)"
   },
   {
     "emc_wall_2",
     "wall",
-    "normal wall"
+    "normal wall 2 (EMC style)"
   },
   {
     "emc_wall_3",
     "wall",
-    "normal wall"
+    "normal wall 3 (EMC style)"
   },
   {
     "emc_wall_4",
     "wall",
-    "normal wall"
+    "normal wall 4 (EMC style)"
   },
   {
     "emc_wall_5",
     "wall",
-    "normal wall"
+    "normal wall 5 (EMC style)"
   },
   {
     "emc_wall_6",
     "wall",
-    "normal wall"
+    "normal wall 6 (EMC style)"
   },
   {
     "emc_wall_7",
     "wall",
-    "normal wall"
+    "normal wall 7 (EMC style)"
   },
   {
     "emc_wall_8",
     "wall",
-    "normal wall"
+    "normal wall 8 (EMC style)"
   },
   {
     "tube_any",
@@ -3648,62 +3645,62 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "emc_wall_9",
     "wall",
-    "normal wall"
+    "normal wall 9 (EMC style)"
   },
   {
     "emc_wall_10",
     "wall",
-    "normal wall"
+    "normal wall 10 (EMC style)"
   },
   {
     "emc_wall_11",
     "wall",
-    "normal wall"
+    "normal wall 11 (EMC style)"
   },
   {
     "emc_wall_12",
     "wall",
-    "normal wall"
+    "normal wall 12 (EMC style)"
   },
   {
     "emc_wall_13",
     "wall",
-    "normal wall"
+    "normal wall 13 (EMC style)"
   },
   {
     "emc_wall_14",
     "wall",
-    "normal wall"
+    "normal wall 14 (EMC style)"
   },
   {
     "emc_wall_15",
     "wall",
-    "normal wall"
+    "normal wall 15 (EMC style)"
   },
   {
     "emc_wall_16",
     "wall",
-    "normal wall"
+    "normal wall 16 (EMC style)"
   },
   {
     "emc_wall_slippery_1",
     "wall",
-    "slippery wall"
+    "slippery wall 1 (EMC style)"
   },
   {
     "emc_wall_slippery_2",
     "wall",
-    "slippery wall"
+    "slippery wall 2 (EMC style)"
   },
   {
     "emc_wall_slippery_3",
     "wall",
-    "slippery wall"
+    "slippery wall 3 (EMC style)"
   },
   {
     "emc_wall_slippery_4",
     "wall",
-    "slippery wall"
+    "slippery wall 4 (EMC style)"
   },
   {
     "emc_fake_grass",
@@ -4241,17 +4238,17 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "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'"
   },
@@ -4318,112 +4315,112 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "dc_steelwall_1_left",
     "steelwall",
-    "steel wall (left)"
+    "steel wall (left)"
   },
   {
     "dc_steelwall_1_right",
     "steelwall",
-    "steel wall (right)"
+    "steel wall (right)"
   },
   {
     "dc_steelwall_1_top",
     "steelwall",
-    "steel wall (top)"
+    "steel wall (top)"
   },
   {
     "dc_steelwall_1_bottom",
     "steelwall",
-    "steel wall (bottom)"
+    "steel wall (bottom)"
   },
   {
     "dc_steelwall_1_horizontal",
     "steelwall",
-    "steel wall (top/bottom)"
+    "steel wall (top/bottom)"
   },
   {
     "dc_steelwall_1_vertical",
     "steelwall",
-    "steel wall (left/right)"
+    "steel wall (left/right)"
   },
   {
     "dc_steelwall_1_topleft",
     "steelwall",
-    "steel wall (top/left)"
+    "steel wall (top/left)"
   },
   {
     "dc_steelwall_1_topright",
     "steelwall",
-    "steel wall (top/right)"
+    "steel wall (top/right)"
   },
   {
     "dc_steelwall_1_bottomleft",
     "steelwall",
-    "steel wall (bottom/left)"
+    "steel wall (bottom/left)"
   },
   {
     "dc_steelwall_1_bottomright",
     "steelwall",
-    "steel wall (bottom/right)"
+    "steel wall (bottom/right)"
   },
   {
     "dc_steelwall_1_topleft_2",
     "steelwall",
-    "steel wall (top/left corner)"
+    "steel wall (top/left corner)"
   },
   {
     "dc_steelwall_1_topright_2",
     "steelwall",
-    "steel wall (top/right corner)"
+    "steel wall (top/right corner)"
   },
   {
     "dc_steelwall_1_bottomleft_2",
     "steelwall",
-    "steel wall (bottom/left corner)"
+    "steel wall (bottom/left corner)"
   },
   {
     "dc_steelwall_1_bottomright_2",
     "steelwall",
-    "steel wall (bottom/right corner)"
+    "steel wall (bottom/right corner)"
   },
   {
     "dc_steelwall_2_left",
     "steelwall",
-    "steel wall (left)"
+    "steel wall (left)"
   },
   {
     "dc_steelwall_2_right",
     "steelwall",
-    "steel wall (right)"
+    "steel wall (right)"
   },
   {
     "dc_steelwall_2_top",
     "steelwall",
-    "steel wall (top)"
+    "steel wall (top)"
   },
   {
     "dc_steelwall_2_bottom",
     "steelwall",
-    "steel wall (bottom)"
+    "steel wall (bottom)"
   },
   {
     "dc_steelwall_2_horizontal",
     "steelwall",
-    "steel wall (horizontal)"
+    "steel wall (horizontal)"
   },
   {
     "dc_steelwall_2_vertical",
     "steelwall",
-    "steel wall (vertical)"
+    "steel wall (vertical)"
   },
   {
     "dc_steelwall_2_middle",
     "steelwall",
-    "steel wall (middle)"
+    "steel wall (middle)"
   },
   {
     "dc_steelwall_2_single",
     "steelwall",
-    "steel wall (single)"
+    "steel wall (single)"
   },
   {
     "dc_switchgate_switch_up",
@@ -4518,7 +4515,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "mm_empty_space",
     "empty_space",
-    "empty_space"
+    "empty space"
   },
   {
     "mm_mirror_1",
@@ -4603,22 +4600,22 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 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",
@@ -4678,322 +4675,322 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "mm_steel_wall_1",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 1 (MM style)"
   },
   {
     "mm_steel_wall_2",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 2 (MM style)"
   },
   {
     "mm_steel_wall_3",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 3 (MM style)"
   },
   {
     "mm_steel_wall_4",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 4 (MM style)"
   },
   {
     "mm_steel_wall_5",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 5 (MM style)"
   },
   {
     "mm_steel_wall_6",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 6 (MM style)"
   },
   {
     "mm_steel_wall_7",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 7 (MM style)"
   },
   {
     "mm_steel_wall_8",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 8 (MM style)"
   },
   {
     "mm_steel_wall_9",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 9 (MM style)"
   },
   {
     "mm_steel_wall_10",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 10 (MM style)"
   },
   {
     "mm_steel_wall_11",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 11 (MM style)"
   },
   {
     "mm_steel_wall_12",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 12 (MM style)"
   },
   {
     "mm_steel_wall_13",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 13 (MM style)"
   },
   {
     "mm_steel_wall_14",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 14 (MM style)"
   },
   {
     "mm_steel_wall_15",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 15 (MM style)"
   },
   {
     "mm_steel_wall_16",
     "mm_steel_wall",
-    "steel wall"
+    "steel wall 16 (MM style)"
   },
   {
     "mm_wooden_wall_1",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 1 (MM style)"
   },
   {
     "mm_wooden_wall_2",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 2 (MM style)"
   },
   {
     "mm_wooden_wall_3",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 3 (MM style)"
   },
   {
     "mm_wooden_wall_4",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 4 (MM style)"
   },
   {
     "mm_wooden_wall_5",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 5 (MM style)"
   },
   {
     "mm_wooden_wall_6",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 6 (MM style)"
   },
   {
     "mm_wooden_wall_7",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 7 (MM style)"
   },
   {
     "mm_wooden_wall_8",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 8 (MM style)"
   },
   {
     "mm_wooden_wall_9",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 9 (MM style)"
   },
   {
     "mm_wooden_wall_10",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 10 (MM style)"
   },
   {
     "mm_wooden_wall_11",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 11 (MM style)"
   },
   {
     "mm_wooden_wall_12",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 12 (MM style)"
   },
   {
     "mm_wooden_wall_13",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 13 (MM style)"
   },
   {
     "mm_wooden_wall_14",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 14 (MM style)"
   },
   {
     "mm_wooden_wall_15",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 15 (MM style)"
   },
   {
     "mm_wooden_wall_16",
     "mm_wooden_wall",
-    "wooden wall"
+    "wooden wall 16 (MM style)"
   },
   {
     "mm_ice_wall_1",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 1"
   },
   {
     "mm_ice_wall_2",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 2"
   },
   {
     "mm_ice_wall_3",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 3"
   },
   {
     "mm_ice_wall_4",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 4"
   },
   {
     "mm_ice_wall_5",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 5"
   },
   {
     "mm_ice_wall_6",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 6"
   },
   {
     "mm_ice_wall_7",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 7"
   },
   {
     "mm_ice_wall_8",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 8"
   },
   {
     "mm_ice_wall_9",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 9"
   },
   {
     "mm_ice_wall_10",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 10"
   },
   {
     "mm_ice_wall_11",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 11"
   },
   {
     "mm_ice_wall_12",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 12"
   },
   {
     "mm_ice_wall_13",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 13"
   },
   {
     "mm_ice_wall_14",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 14"
   },
   {
     "mm_ice_wall_15",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 15"
   },
   {
     "mm_ice_wall_16",
     "mm_ice_wall",
-    "ice wall"
+    "ice wall 16"
   },
   {
     "mm_amoeba_wall_1",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 1"
   },
   {
     "mm_amoeba_wall_2",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 2"
   },
   {
     "mm_amoeba_wall_3",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 3"
   },
   {
     "mm_amoeba_wall_4",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 4"
   },
   {
     "mm_amoeba_wall_5",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 5"
   },
   {
     "mm_amoeba_wall_6",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 6"
   },
   {
     "mm_amoeba_wall_7",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 7"
   },
   {
     "mm_amoeba_wall_8",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 8"
   },
   {
     "mm_amoeba_wall_9",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 9"
   },
   {
     "mm_amoeba_wall_10",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 10"
   },
   {
     "mm_amoeba_wall_11",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 11"
   },
   {
     "mm_amoeba_wall_12",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 12"
   },
   {
     "mm_amoeba_wall_13",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 13"
   },
   {
     "mm_amoeba_wall_14",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 14"
   },
   {
     "mm_amoeba_wall_15",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 15"
   },
   {
     "mm_amoeba_wall_16",
     "mm_amoeba_wall",
-    "amoeba wall"
+    "amoeba wall 16"
   },
   {
     "mm_wooden_block",
@@ -5006,84 +5003,84 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "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",
@@ -5111,104 +5108,104 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "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",
@@ -5248,7 +5245,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "mm_lightbulb.active",
     "mm_lightbulb",
-    "ligh bulb (on)"
+    "light bulb (on)"
   },
   {
     "mm_lightball",
@@ -5273,28 +5270,48 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "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",
     "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",
@@ -5378,247 +5395,247 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "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_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall (DF style)"
   },
   {
     "df_wooden_wall_2",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall (DF style)"
   },
   {
     "df_wooden_wall_3",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall (DF style)"
   },
   {
     "df_wooden_wall_4",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall (DF style)"
   },
   {
     "df_wooden_wall_5",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall (DF style)"
   },
   {
     "df_wooden_wall_6",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall (DF style)"
   },
   {
     "df_wooden_wall_7",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall (DF style)"
   },
   {
     "df_wooden_wall_8",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall (DF style)"
   },
   {
     "df_wooden_wall_9",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall (DF style)"
   },
   {
     "df_wooden_wall_10",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall 10 (DF style)"
   },
   {
     "df_wooden_wall_11",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall 11 (DF style)"
   },
   {
     "df_wooden_wall_12",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall 12 (DF style)"
   },
   {
     "df_wooden_wall_13",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall 13 (DF style)"
   },
   {
     "df_wooden_wall_14",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall 14 (DF style)"
   },
   {
     "df_wooden_wall_15",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall 15 (DF style)"
   },
   {
     "df_wooden_wall_16",
     "df_wooden_wall",
-    "wooden wall (DF style)"
+    "wooden wall 16 (DF style)"
   },
   {
     "df_steel_wall_1",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall (DF style)"
   },
   {
     "df_steel_wall_2",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall (DF style)"
   },
   {
     "df_steel_wall_3",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall (DF style)"
   },
   {
     "df_steel_wall_4",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall (DF style)"
   },
   {
     "df_steel_wall_5",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall (DF style)"
   },
   {
     "df_steel_wall_6",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall (DF style)"
   },
   {
     "df_steel_wall_7",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall (DF style)"
   },
   {
     "df_steel_wall_8",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall (DF style)"
   },
   {
     "df_steel_wall_9",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall (DF style)"
   },
   {
     "df_steel_wall_10",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall 10 (DF style)"
   },
   {
     "df_steel_wall_11",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall 11 (DF style)"
   },
   {
     "df_steel_wall_12",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall 12 (DF style)"
   },
   {
     "df_steel_wall_13",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall 13 (DF style)"
   },
   {
     "df_steel_wall_14",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall 14 (DF style)"
   },
   {
     "df_steel_wall_15",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall 15 (DF style)"
   },
   {
     "df_steel_wall_16",
     "df_steel_wall",
-    "steel wall (DF style)"
+    "steel wall 16 (DF style)"
   },
   {
     "df_empty_space",
     "empty_space",
-    "empty_space"
+    "empty space"
   },
   {
     "df_cell",
@@ -5798,402 +5815,402 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "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",
@@ -6213,12 +6230,12 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "mm_steel_wall",
     "mm_steel_wall",
-    "steel wall",
+    "steel wall (MM style)",
   },
   {
     "mm_wooden_wall",
     "mm_wooden_wall",
-    "wooden wall",
+    "wooden wall (MM style)",
   },
   {
     "mm_ice_wall",
@@ -6250,10 +6267,20 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "df_wooden_wall",
     "wooden wall (DF style)",
   },
+  {
+    "spring.left",
+    "spring",
+    "spring (starts moving left)"
+  },
+  {
+    "spring.right",
+    "spring",
+    "spring (starts moving right)"
+  },
 
-  /* ----------------------------------------------------------------------- */
-  /* "real" (and therefore drawable) runtime elements                        */
-  /* ----------------------------------------------------------------------- */
+  // --------------------------------------------------------------------------
+  // "real" (and therefore drawable) runtime elements
+  // --------------------------------------------------------------------------
 
   {
     "dynabomb_player_1.active",
@@ -6641,10 +6668,30 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "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                  */
-  /* ----------------------------------------------------------------------- */
+  // --------------------------------------------------------------------------
+  // "unreal" (and therefore not drawable) runtime elements
+  // --------------------------------------------------------------------------
 
   {
     "blocked",
@@ -6767,9 +6814,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",
@@ -7197,7 +7244,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,
@@ -7207,9 +7254,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] =
 {
@@ -7265,6 +7312,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   },
@@ -7331,7 +7379,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       }
@@ -7387,25 +7435,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] =
 {
@@ -7442,6 +7491,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" },
@@ -7450,16 +7500,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",       },
@@ -7493,7 +7544,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",           },
@@ -7530,10 +7581,15 @@ struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
   { 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] =
 {
@@ -7543,11 +7599,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"
@@ -7563,7 +7619,7 @@ static void print_usage()
        "      --serveronly                 only start network server\n"
        "  -v, --verbose                    verbose mode\n"
        "  -V, --version                    show program version\n"
-       "      --debug                      display debugging information\n"
+       "      --debug[=MODE]               show (and limit) debug output\n"
        "  -e, --execute COMMAND            execute batch COMMAND\n"
        "\n"
        "Valid commands for '--execute' option:\n"
@@ -7575,10 +7631,12 @@ static void print_usage()
        "  \"print helptext.conf\"            print default helptext config\n"
        "  \"dump level FILE\"                dump level data from FILE\n"
        "  \"dump tape FILE\"                 dump tape data from FILE\n"
-       "  \"autotest LEVELDIR [NR ...]\"     test level tapes for LEVELDIR\n"
        "  \"autoplay LEVELDIR [NR ...]\"     play level tapes for LEVELDIR\n"
        "  \"autoffwd LEVELDIR [NR ...]\"     ffwd level tapes for LEVELDIR\n"
        "  \"autowarp LEVELDIR [NR ...]\"     warp level tapes for LEVELDIR\n"
+       "  \"autotest LEVELDIR [NR ...]\"     test level tapes for LEVELDIR\n"
+       "  \"autofix LEVELDIR [NR ...]\"      test and fix tapes for LEVELDIR\n"
+       "  \"patch tapes MODE LEVELDIR [NR]\" patch level tapes for LEVELDIR\n"
        "  \"convert LEVELDIR [NR]\"          convert levels in LEVELDIR\n"
        "  \"create images DIRECTORY\"        write BMP images to DIRECTORY\n"
        "  \"create CE image DIRECTORY\"      write BMP image to DIRECTORY\n"
@@ -7586,7 +7644,7 @@ static void print_usage()
        program.command_basename);
 }
 
-static void print_version()
+static void print_version(void)
 {
   Print("%s", getProgramInitString());
 
@@ -7594,10 +7652,10 @@ static void print_version()
   {
     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);
   }
 
@@ -7641,22 +7699,30 @@ static void InitProgramConfig(char *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
-    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);
   }
 
+#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 &&
@@ -7715,5 +7781,5 @@ int main(int argc, char *argv[])
   EventLoop();
   CloseAllAndExit(0);
 
-  return 0;    /* to keep compilers happy */
+  return 0;    // to keep compilers happy
 }