rnd-20060430-4-src
[rocksndiamonds.git] / src / tools.c
index 4711961d04144b313957294b5e84ec4d215b90d7..65c6255871d133ba329e29f677649d03ef6a0429 100644 (file)
 #include "network.h"
 #include "tape.h"
 
+
+/* select level set with EMC X11 graphics before activating EM GFX debugging */
+#define DEBUG_EM_GFX   0
+
 /* tool button identifiers */
 #define TOOL_CTRL_ID_YES       0
 #define TOOL_CTRL_ID_NO                1
@@ -63,6 +67,12 @@ void DumpTile(int x, int y)
   int sx = SCREENX(x);
   int sy = SCREENY(y);
 
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+  {
+    x--;
+    y--;
+  }
+
   printf_line("-", 79);
   printf("Field Info: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y);
   printf_line("-", 79);
@@ -127,7 +137,9 @@ void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height)
   if (game_status == GAME_MODE_PLAYING &&
       level.game_engine_type == GAME_ENGINE_TYPE_EM)
   {
-    BlitScreenToBitmap_EM(backbuffer);
+    /* currently there is no partial redraw -- always redraw whole playfield */
+
+    RedrawPlayfield_EM(TRUE);
   }
   else if (game_status == GAME_MODE_PLAYING && !game.envelope_active)
   {
@@ -229,7 +241,8 @@ void BackToFront()
   if (redraw_mask & REDRAW_ALL)
   {
     BlitBitmap(backbuffer, window, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-    redraw_mask = 0;
+
+    redraw_mask = REDRAW_NONE;
   }
 
   if (redraw_mask & REDRAW_FIELD)
@@ -401,6 +414,50 @@ void FadeToFront()
   BackToFront();
 }
 
+void FadeIn(int fade_delay)
+{
+  if (fade_delay == 0)
+  {
+    BackToFront();
+
+    return;
+  }
+
+  FadeScreen(NULL, FADE_MODE_FADE_IN, fade_delay, 0);
+
+  redraw_mask = REDRAW_NONE;
+}
+
+void FadeOut(int fade_delay, int post_delay)
+{
+  if (fade_delay == 0)
+  {
+    ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE);
+    BackToFront();
+
+    return;
+  }
+
+  FadeScreen(NULL, FADE_MODE_FADE_OUT, fade_delay, post_delay);
+
+  redraw_mask = REDRAW_NONE;
+}
+
+void FadeCross(int fade_delay)
+{
+  if (fade_delay == 0)
+  {
+    BlitBitmap(bitmap_db_title, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+    BackToFront();
+
+    return;
+  }
+
+  FadeScreen(bitmap_db_title, FADE_MODE_CROSSFADE, fade_delay, 0);
+
+  redraw_mask = REDRAW_NONE;
+}
+
 void SetMainBackgroundImageIfDefined(int graphic)
 {
   if (graphic_info[graphic].bitmap)
@@ -491,6 +548,17 @@ inline int getGraphicAnimationFrame(int graphic, int sync_frame)
   if (graphic_info[graphic].anim_global_sync || sync_frame < 0)
     sync_frame = FrameCounter;
 
+#if 0
+  if (graphic == element_info[EL_CUSTOM_START + 255].graphic[ACTION_DEFAULT] &&
+      sync_frame == 0 &&
+      FrameCounter > 10)
+  {
+    int x = 1 / 0;
+
+    printf("::: FOO!\n");
+  }
+#endif
+
   return getAnimationFrame(graphic_info[graphic].anim_frames,
                           graphic_info[graphic].anim_delay,
                           graphic_info[graphic].anim_mode,
@@ -737,11 +805,14 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy,
   int y2 = y + SIGN(dy);
   int anim_frames = graphic_info[graphic].anim_frames;
   int sync_frame = (dx ? ABS(dx) : ABS(dy)) * anim_frames / TILESIZE;
+  boolean draw_start_tile = (cut_mode != CUT_ABOVE);   /* only for falling! */
+  boolean draw_end_tile   = (cut_mode != CUT_BELOW);   /* only for falling! */
 
   /* re-calculate animation frame for two-tile movement animation */
   frame = getGraphicAnimationFrame(graphic, sync_frame);
 
-  if (IN_SCR_FIELD(x1, y1))    /* movement start graphic inside screen area */
+  /* check if movement start graphic inside screen area and should be drawn */
+  if (draw_start_tile && IN_SCR_FIELD(x1, y1))
   {
     getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, TRUE);
 
@@ -762,7 +833,8 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy,
     MarkTileDirty(x1, y1);
   }
 
-  if (IN_SCR_FIELD(x2, y2))    /* movement end graphic inside screen area */
+  /* check if movement end graphic inside screen area and should be drawn */
+  if (draw_end_tile && IN_SCR_FIELD(x2, y2))
   {
     getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, FALSE);
 
@@ -895,10 +967,6 @@ void DrawLevelFieldThruMask(int x, int y)
   DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING);
 }
 
-#define TILE_GFX_ELEMENT(x, y)                                             \
-       (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ?   \
-        GfxElement[x][y] : Feld[x][y])
-
 static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame)
 {
   Bitmap *src_bitmap;
@@ -1033,10 +1101,19 @@ void DrawLevelFieldCrumbledSand(int x, int y)
     return;
 
 #if 1
+  /* !!! CHECK THIS !!! */
+
+  /*
   if (Feld[x][y] == EL_ELEMENT_SNAPPING &&
       GFX_CRUMBLED(GfxElement[x][y]))
+  */
+
+  if (Feld[x][y] == EL_ELEMENT_SNAPPING &&
+      GfxElement[x][y] != EL_UNDEFINED &&
+      GFX_CRUMBLED(GfxElement[x][y]))
   {
     DrawLevelFieldCrumbledSandDigging(x, y, GfxDir[x][y], GfxFrame[x][y]);
+
     return;
   }
 #endif
@@ -1375,7 +1452,7 @@ void ShowEnvelope(int envelope_nr)
 
   game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */
 
-  PlaySoundStereo(sound_opening, SOUND_MIDDLE);
+  PlayMenuSoundStereo(sound_opening, SOUND_MIDDLE);
 
   if (anim_mode == ANIM_DEFAULT)
     AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_OPENING);
@@ -1387,7 +1464,7 @@ void ShowEnvelope(int envelope_nr)
   else
     WaitForEventToContinue();
 
-  PlaySoundStereo(sound_closing, SOUND_MIDDLE);
+  PlayMenuSoundStereo(sound_closing, SOUND_MIDDLE);
 
   if (anim_mode != ANIM_NONE)
     AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_CLOSING);
@@ -1631,9 +1708,9 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart)
 
   /* !!! THIS ALL SUCKS -- SHOULD BE CLEANLY REWRITTEN !!! */
   /* redraw micro level label, if needed */
-  if (strcmp(level.name, NAMELESS_LEVEL_NAME) != 0 &&
-      strcmp(level.author, ANONYMOUS_NAME) != 0 &&
-      strcmp(level.author, leveldir_current->name) != 0 &&
+  if (!strEqual(level.name, NAMELESS_LEVEL_NAME) &&
+      !strEqual(level.author, ANONYMOUS_NAME) &&
+      !strEqual(level.author, leveldir_current->name) &&
       DelayReached(&label_delay, MICROLEVEL_LABEL_DELAY))
   {
     int max_label_counter = 23;
@@ -1814,6 +1891,7 @@ void DrawPlayer(struct PlayerInfo *player)
   int next_jx = jx + dx;
   int next_jy = jy + dy;
   boolean player_is_moving = (player->MovPos ? TRUE : FALSE);
+  boolean player_is_opaque = FALSE;
   int sx = SCREENX(jx), sy = SCREENY(jy);
   int sxx = 0, syy = 0;
   int element = Feld[jx][jy], last_element = Feld[last_jx][last_jy];
@@ -1823,6 +1901,13 @@ void DrawPlayer(struct PlayerInfo *player)
   int last_player_frame = player->Frame;
   int frame = 0;
 
+#if 1
+  /* GfxElement[][] is set to the element the player is digging or collecting;
+     remove also for off-screen player if the player is not moving anymore */
+  if (IN_LEV_FIELD(jx, jy) && !player_is_moving)
+    GfxElement[jx][jy] = EL_UNDEFINED;
+#endif
+
   if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy)))
     return;
 
@@ -1847,6 +1932,11 @@ void DrawPlayer(struct PlayerInfo *player)
            player->is_dropping   ? ACTION_DROPPING        :
            player->is_waiting    ? player->action_waiting : ACTION_DEFAULT);
 
+#if 1
+  if (player->is_waiting)
+    move_dir = player->dir_waiting;
+#endif
+
   InitPlayerGfxAnimation(player, action, move_dir);
 
   /* ----------------------------------------------------------------------- */
@@ -1860,12 +1950,14 @@ void DrawPlayer(struct PlayerInfo *player)
       DrawLevelElement(last_jx, last_jy, Back[last_jx][last_jy]);
 
       if (last_element == EL_DYNAMITE_ACTIVE ||
+         last_element == EL_EM_DYNAMITE_ACTIVE ||
          last_element == EL_SP_DISK_RED_ACTIVE)
        DrawDynamite(last_jx, last_jy);
       else
        DrawLevelFieldThruMask(last_jx, last_jy);
     }
     else if (last_element == EL_DYNAMITE_ACTIVE ||
+            last_element == EL_EM_DYNAMITE_ACTIVE ||
             last_element == EL_SP_DISK_RED_ACTIVE)
       DrawDynamite(last_jx, last_jy);
     else
@@ -1893,16 +1985,17 @@ void DrawPlayer(struct PlayerInfo *player)
   {
     if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED)
     {
-      if (GFX_CRUMBLED(GfxElement[jx][jy]))
+      int old_element = GfxElement[jx][jy];
+      int old_graphic = el_act_dir2img(old_element, action, move_dir);
+      int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame);
+
+      if (GFX_CRUMBLED(old_element))
        DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame);
       else
-      {
-       int old_element = GfxElement[jx][jy];
-       int old_graphic = el_act_dir2img(old_element, action, move_dir);
-       int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame);
-
        DrawGraphic(sx, sy, old_graphic, frame);
-      }
+
+      if (graphic_info[old_graphic].anim_mode & ANIM_OPAQUE_PLAYER)
+       player_is_opaque = TRUE;
     }
     else
     {
@@ -1940,7 +2033,10 @@ void DrawPlayer(struct PlayerInfo *player)
   if (!setup.soft_scrolling && ScreenMovPos)
     sxx = syy = 0;
 
-  DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING);
+  if (player_is_opaque)
+    DrawGraphicShifted(sx, sy, sxx, syy, graphic, frame,NO_CUTTING,NO_MASKING);
+  else
+    DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING);
 
   if (SHIELD_ON(player))
   {
@@ -2003,7 +2099,9 @@ void DrawPlayer(struct PlayerInfo *player)
 
   if (player_is_moving && last_element == EL_EXPLOSION)
   {
-    int graphic = el_act2img(GfxElement[last_jx][last_jy], ACTION_EXPLODING);
+    int element = (GfxElement[last_jx][last_jy] != EL_UNDEFINED ?
+                  GfxElement[last_jx][last_jy] :  EL_EMPTY);
+    int graphic = el_act2img(element, ACTION_EXPLODING);
     int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2);
     int phase = ExplodePhase[last_jx][last_jy] - 1;
     int frame = getGraphicAnimationFrame(graphic, phase - delay);
@@ -2460,7 +2558,7 @@ unsigned int MoveDoor(unsigned int door_state)
     door_2.height = VYSIZE;
 
   if (door_state == DOOR_GET_STATE)
-    return(door1 | door2);
+    return (door1 | door2);
 
   if (door_state & DOOR_SET_STATE)
   {
@@ -2469,17 +2567,20 @@ unsigned int MoveDoor(unsigned int door_state)
     if (door_state & DOOR_ACTION_2)
       door2 = door_state & DOOR_ACTION_2;
 
-    return(door1 | door2);
+    return (door1 | door2);
   }
 
-  if (door1 == DOOR_OPEN_1 && door_state & DOOR_OPEN_1)
-    door_state &= ~DOOR_OPEN_1;
-  else if (door1 == DOOR_CLOSE_1 && door_state & DOOR_CLOSE_1)
-    door_state &= ~DOOR_CLOSE_1;
-  if (door2 == DOOR_OPEN_2 && door_state & DOOR_OPEN_2)
-    door_state &= ~DOOR_OPEN_2;
-  else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2)
-    door_state &= ~DOOR_CLOSE_2;
+  if (!(door_state & DOOR_FORCE_REDRAW))
+  {
+    if (door1 == DOOR_OPEN_1 && door_state & DOOR_OPEN_1)
+      door_state &= ~DOOR_OPEN_1;
+    else if (door1 == DOOR_CLOSE_1 && door_state & DOOR_CLOSE_1)
+      door_state &= ~DOOR_CLOSE_1;
+    if (door2 == DOOR_OPEN_2 && door_state & DOOR_OPEN_2)
+      door_state &= ~DOOR_OPEN_2;
+    else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2)
+      door_state &= ~DOOR_CLOSE_2;
+  }
 
   door_delay_value = (door_state & DOOR_ACTION_1 ? door_1.step_delay :
                      door_2.step_delay);
@@ -2528,9 +2629,9 @@ unsigned int MoveDoor(unsigned int door_state)
     {
       /* opening door sound has priority over simultaneously closing door */
       if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2))
-       PlaySoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE);
+       PlayMenuSoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE);
       else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2))
-       PlaySoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE);
+       PlayMenuSoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE);
     }
 
     for (k = start; k <= end && !(door_1_done && door_2_done); k += stepsize)
@@ -2712,13 +2813,15 @@ unsigned int MoveDoor(unsigned int door_state)
        door_2_done = (a == VXSIZE);
       }
 
-      BackToFront();
+      if (!(door_state & DOOR_NO_DELAY))
+      {
+       BackToFront();
 
-      if (game_status == GAME_MODE_MAIN)
-       DoAnimation();
+       if (game_status == GAME_MODE_MAIN)
+         DoAnimation();
 
-      if (!(door_state & DOOR_NO_DELAY))
        WaitUntilDelayReached(&door_delay, door_delay_value);
+      }
     }
   }
 
@@ -3436,35 +3539,35 @@ em_object_mapping_list[] =
   },
   {
     Yspring_kill_e,                    FALSE,  FALSE,
-    EL_ROBOT,                          ACTION_SLURPED_BY_SPRING, MV_BIT_RIGHT
+    EL_SPRING,                         ACTION_EATING, MV_BIT_RIGHT
   },
   {
     Yspring_kill_eB,                   FALSE,  TRUE,
-    EL_ROBOT,                          ACTION_SLURPED_BY_SPRING, MV_BIT_RIGHT
+    EL_SPRING,                         ACTION_EATING, MV_BIT_RIGHT
   },
   {
     Yspring_kill_w,                    FALSE,  FALSE,
-    EL_ROBOT,                          ACTION_SLURPED_BY_SPRING, MV_BIT_LEFT
+    EL_SPRING,                         ACTION_EATING, MV_BIT_LEFT
   },
   {
     Yspring_kill_wB,                   FALSE,  TRUE,
-    EL_ROBOT,                          ACTION_SLURPED_BY_SPRING, MV_BIT_LEFT
+    EL_SPRING,                         ACTION_EATING, MV_BIT_LEFT
   },
   {
     Xeater_n,                          TRUE,   FALSE,
-    EL_YAMYAM,                         -1, -1
+    EL_YAMYAM_UP,                      -1, -1
   },
   {
-    Xeater_e,                          FALSE,  FALSE,
-    EL_YAMYAM,                         -1, -1
+    Xeater_e,                          TRUE,   FALSE,
+    EL_YAMYAM_RIGHT,                   -1, -1
   },
   {
-    Xeater_w,                          FALSE,  FALSE,
-    EL_YAMYAM,                         -1, -1
+    Xeater_w,                          TRUE,   FALSE,
+    EL_YAMYAM_LEFT,                    -1, -1
   },
   {
-    Xeater_s,                          FALSE,  FALSE,
-    EL_YAMYAM,                         -1, -1
+    Xeater_s,                          TRUE,   FALSE,
+    EL_YAMYAM_DOWN,                    -1, -1
   },
   {
     Yeater_n,                          FALSE,  FALSE,
@@ -4080,27 +4183,27 @@ em_object_mapping_list[] =
   },
   {
     Xdynamite,                         TRUE,   FALSE,
-    EL_DYNAMITE,                       -1, -1
+    EL_EM_DYNAMITE,                    -1, -1
   },
   {
     Ydynamite_eat,                     FALSE,  FALSE,
-    EL_DYNAMITE,                       ACTION_COLLECTING, -1
+    EL_EM_DYNAMITE,                    ACTION_COLLECTING, -1
   },
   {
     Xdynamite_1,                       TRUE,   FALSE,
-    EL_DYNAMITE_ACTIVE,                        -1, -1
+    EL_EM_DYNAMITE_ACTIVE,             -1, -1
   },
   {
     Xdynamite_2,                       FALSE,  FALSE,
-    EL_DYNAMITE_ACTIVE,                        -1, -1
+    EL_EM_DYNAMITE_ACTIVE,             -1, -1
   },
   {
     Xdynamite_3,                       FALSE,  FALSE,
-    EL_DYNAMITE_ACTIVE,                        -1, -1
+    EL_EM_DYNAMITE_ACTIVE,             -1, -1
   },
   {
     Xdynamite_4,                       FALSE,  FALSE,
-    EL_DYNAMITE_ACTIVE,                        -1, -1
+    EL_EM_DYNAMITE_ACTIVE,             -1, -1
   },
   {
     Xbumper,                           TRUE,   FALSE,
@@ -4135,19 +4238,19 @@ em_object_mapping_list[] =
     EL_QUICKSAND_FULL,                 -1, -1
   },
   {
-    Xsand_stonein_1,                   FALSE,  FALSE,
+    Xsand_stonein_1,                   FALSE,  TRUE,
     EL_ROCK,                           ACTION_FILLING, -1
   },
   {
-    Xsand_stonein_2,                   FALSE,  FALSE,
+    Xsand_stonein_2,                   FALSE,  TRUE,
     EL_ROCK,                           ACTION_FILLING, -1
   },
   {
-    Xsand_stonein_3,                   FALSE,  FALSE,
+    Xsand_stonein_3,                   FALSE,  TRUE,
     EL_ROCK,                           ACTION_FILLING, -1
   },
   {
-    Xsand_stonein_4,                   FALSE,  FALSE,
+    Xsand_stonein_4,                   FALSE,  TRUE,
     EL_ROCK,                           ACTION_FILLING, -1
   },
   {
@@ -4574,10 +4677,6 @@ em_object_mapping_list[] =
     Xalpha_copyr,                      TRUE,   FALSE,
     EL_CHAR('©'),                      -1, -1
   },
-  {
-    Xalpha_copyr,                      TRUE,   FALSE,
-    EL_CHAR('©'),                      -1, -1
-  },
 
   {
     Xboom_bug,                         FALSE,  FALSE,
@@ -4965,640 +5064,6 @@ void map_android_clone_elements_EM_to_RND(struct LevelInfo *level)
   }
 }
 
-#if 0
-
-int map_element_RND_to_EM(int element_rnd)
-{
-  static unsigned short mapping_RND_to_EM[NUM_FILE_ELEMENTS];
-  static boolean mapping_initialized = FALSE;
-
-  struct
-  {
-    int element_em;
-    int element_rnd;
-  }
-  mapping_RND_to_EM_list[] =
-  {
-    { Xblank,                  EL_EMPTY                        },
-    { Xstone,                  EL_ROCK                         },
-    { Xnut,                    EL_NUT                          },
-    { Xbug_n,                  EL_BUG_UP                       },
-    { Xbug_e,                  EL_BUG_RIGHT                    },
-    { Xbug_s,                  EL_BUG_DOWN                     },
-    { Xbug_w,                  EL_BUG_LEFT                     },
-    { Xtank_n,                 EL_SPACESHIP_UP                 },
-    { Xtank_e,                 EL_SPACESHIP_RIGHT              },
-    { Xtank_s,                 EL_SPACESHIP_DOWN               },
-    { Xtank_w,                 EL_SPACESHIP_LEFT               },
-    { Xandroid,                        EL_EMC_ANDROID                  },
-    { Xandroid_1_n,            EL_EMC_ANDROID_UP               },
-    { Xandroid_1_e,            EL_EMC_ANDROID_RIGHT            },
-    { Xandroid_1_w,            EL_EMC_ANDROID_LEFT             },
-    { Xandroid_1_s,            EL_EMC_ANDROID_DOWN             },
-    { Xspring,                 EL_SPRING                       },
-    { Xeater_n,                        EL_YAMYAM                       },
-    { Xalien,                  EL_ROBOT                        },
-    { Xemerald,                        EL_EMERALD                      },
-    { Xdiamond,                        EL_DIAMOND                      },
-    { Xdrip_fall,              EL_AMOEBA_DROP                  },
-    { Xbomb,                   EL_BOMB                         },
-    { Xballoon,                        EL_BALLOON                      },
-    { Xgrass,                  EL_EMC_GRASS                    },
-    { Xdirt,                   EL_SAND                         },
-    { Xacid_ne,                        EL_ACID_POOL_TOPRIGHT           },
-    { Xacid_se,                        EL_ACID_POOL_BOTTOMRIGHT        },
-    { Xacid_s,                 EL_ACID_POOL_BOTTOM             },
-    { Xacid_sw,                        EL_ACID_POOL_BOTTOMLEFT         },
-    { Xacid_nw,                        EL_ACID_POOL_TOPLEFT            },
-    { Xacid_1,                 EL_ACID                         },
-    { Xball_1,                 EL_EMC_MAGIC_BALL               },
-    { Xgrow_ns,                        EL_EMC_GROW                     },
-    { Xwonderwall,             EL_MAGIC_WALL                   },
-    { Xamoeba_1,               EL_AMOEBA_WET                   },
-    { Xdoor_1,                 EL_EM_GATE_1                    },
-    { Xdoor_2,                 EL_EM_GATE_2                    },
-    { Xdoor_3,                 EL_EM_GATE_3                    },
-    { Xdoor_4,                 EL_EM_GATE_4                    },
-    { Xdoor_5,                 EL_EMC_GATE_5                   },
-    { Xdoor_6,                 EL_EMC_GATE_6                   },
-    { Xdoor_7,                 EL_EMC_GATE_7                   },
-    { Xdoor_8,                 EL_EMC_GATE_8                   },
-    { Xkey_1,                  EL_EM_KEY_1                     },
-    { Xkey_2,                  EL_EM_KEY_2                     },
-    { Xkey_3,                  EL_EM_KEY_3                     },
-    { Xkey_4,                  EL_EM_KEY_4                     },
-    { Xkey_5,                  EL_EMC_KEY_5                    },
-    { Xkey_6,                  EL_EMC_KEY_6                    },
-    { Xkey_7,                  EL_EMC_KEY_7                    },
-    { Xkey_8,                  EL_EMC_KEY_8                    },
-    { Xwind_n,                 EL_BALLOON_SWITCH_UP            },
-    { Xwind_e,                 EL_BALLOON_SWITCH_RIGHT         },
-    { Xwind_s,                 EL_BALLOON_SWITCH_DOWN          },
-    { Xwind_w,                 EL_BALLOON_SWITCH_LEFT          },
-    { Xwind_nesw,              EL_BALLOON_SWITCH_ANY           },
-    { Xwind_stop,              EL_BALLOON_SWITCH_NONE          },
-    { Xexit,                   EL_EXIT_CLOSED                  },
-    { Xexit_1,                 EL_EXIT_OPEN                    },
-    { Xdynamite,               EL_DYNAMITE                     },
-    { Xdynamite_1,             EL_DYNAMITE_ACTIVE              },
-    { Xbumper,                 EL_EMC_BUMPER                   },
-    { Xwheel,                  EL_ROBOT_WHEEL                  },
-    { Xswitch,                 EL_UNKNOWN                      },
-    { Xsand,                   EL_QUICKSAND_EMPTY              },
-    { Xsand_stone,             EL_QUICKSAND_FULL               },
-    { Xplant,                  EL_EMC_PLANT                    },
-    { Xlenses,                 EL_EMC_LENSES                   },
-    { Xmagnify,                        EL_EMC_MAGNIFIER                },
-    { Xdripper,                        EL_UNKNOWN                      },
-    { Xfake_blank,             EL_INVISIBLE_WALL               },
-    { Xfake_grass,             EL_INVISIBLE_SAND               },
-    { Xfake_door_1,            EL_EM_GATE_1_GRAY               },
-    { Xfake_door_2,            EL_EM_GATE_2_GRAY               },
-    { Xfake_door_3,            EL_EM_GATE_3_GRAY               },
-    { Xfake_door_4,            EL_EM_GATE_4_GRAY               },
-    { Xfake_door_5,            EL_EMC_GATE_5_GRAY              },
-    { Xfake_door_6,            EL_EMC_GATE_6_GRAY              },
-    { Xfake_door_7,            EL_EMC_GATE_7_GRAY              },
-    { Xfake_door_8,            EL_EMC_GATE_8_GRAY              },
-    { Xsteel_1,                        EL_STEELWALL                    },
-    { Xsteel_2,                        EL_UNKNOWN                      },
-    { Xsteel_3,                        EL_EMC_STEELWALL_1              },
-    { Xsteel_4,                        EL_UNKNOWN                      },
-    { Xwall_1,                 EL_WALL                         },
-    { Xwall_2,                 EL_UNKNOWN                      },
-    { Xwall_3,                 EL_UNKNOWN                      },
-    { Xwall_4,                 EL_UNKNOWN                      },
-    { Xround_wall_1,           EL_WALL_SLIPPERY                },
-    { Xround_wall_2,           EL_UNKNOWN                      },
-    { Xround_wall_3,           EL_UNKNOWN                      },
-    { Xround_wall_4,           EL_UNKNOWN                      },
-    { Xdecor_1,                        EL_UNKNOWN                      },
-    { Xdecor_2,                        EL_EMC_WALL_6                   },
-    { Xdecor_3,                        EL_EMC_WALL_4                   },
-    { Xdecor_4,                        EL_EMC_WALL_5                   },
-    { Xdecor_5,                        EL_EMC_WALL_7                   },
-    { Xdecor_6,                        EL_EMC_WALL_8                   },
-    { Xdecor_7,                        EL_UNKNOWN                      },
-    { Xdecor_8,                        EL_EMC_WALL_1                   },
-    { Xdecor_9,                        EL_EMC_WALL_2                   },
-    { Xdecor_10,               EL_EMC_WALL_3                   },
-    { Xdecor_11,               EL_UNKNOWN                      },
-    { Xdecor_12,               EL_UNKNOWN                      },
-    { Xalpha_0,                        EL_CHAR('0')                    },
-    { Xalpha_1,                        EL_CHAR('1')                    },
-    { Xalpha_2,                        EL_CHAR('2')                    },
-    { Xalpha_3,                        EL_CHAR('3')                    },
-    { Xalpha_4,                        EL_CHAR('4')                    },
-    { Xalpha_5,                        EL_CHAR('5')                    },
-    { Xalpha_6,                        EL_CHAR('6')                    },
-    { Xalpha_7,                        EL_CHAR('7')                    },
-    { Xalpha_8,                        EL_CHAR('8')                    },
-    { Xalpha_9,                        EL_CHAR('9')                    },
-    { Xalpha_excla,            EL_CHAR('!')                    },
-    { Xalpha_quote,            EL_CHAR('"')                    },
-    { Xalpha_comma,            EL_CHAR(',')                    },
-    { Xalpha_minus,            EL_CHAR('-')                    },
-    { Xalpha_perio,            EL_CHAR('.')                    },
-    { Xalpha_colon,            EL_CHAR(':')                    },
-    { Xalpha_quest,            EL_CHAR('?')                    },
-    { Xalpha_a,                        EL_CHAR('A')                    },
-    { Xalpha_b,                        EL_CHAR('B')                    },
-    { Xalpha_c,                        EL_CHAR('C')                    },
-    { Xalpha_d,                        EL_CHAR('D')                    },
-    { Xalpha_e,                        EL_CHAR('E')                    },
-    { Xalpha_f,                        EL_CHAR('F')                    },
-    { Xalpha_g,                        EL_CHAR('G')                    },
-    { Xalpha_h,                        EL_CHAR('H')                    },
-    { Xalpha_i,                        EL_CHAR('I')                    },
-    { Xalpha_j,                        EL_CHAR('J')                    },
-    { Xalpha_k,                        EL_CHAR('K')                    },
-    { Xalpha_l,                        EL_CHAR('L')                    },
-    { Xalpha_m,                        EL_CHAR('M')                    },
-    { Xalpha_n,                        EL_CHAR('N')                    },
-    { Xalpha_o,                        EL_CHAR('O')                    },
-    { Xalpha_p,                        EL_CHAR('P')                    },
-    { Xalpha_q,                        EL_CHAR('Q')                    },
-    { Xalpha_r,                        EL_CHAR('R')                    },
-    { Xalpha_s,                        EL_CHAR('S')                    },
-    { Xalpha_t,                        EL_CHAR('T')                    },
-    { Xalpha_u,                        EL_CHAR('U')                    },
-    { Xalpha_v,                        EL_CHAR('V')                    },
-    { Xalpha_w,                        EL_CHAR('W')                    },
-    { Xalpha_x,                        EL_CHAR('X')                    },
-    { Xalpha_y,                        EL_CHAR('Y')                    },
-    { Xalpha_z,                        EL_CHAR('Z')                    },
-    { Xalpha_arrow_e,          EL_CHAR('>')                    },
-    { Xalpha_arrow_w,          EL_CHAR('<')                    },
-    { Xalpha_copyr,            EL_CHAR('©')                    },
-
-    { Zplayer,                 EL_PLAYER_1                     },
-    { Zplayer,                 EL_PLAYER_2                     },
-    { Zplayer,                 EL_PLAYER_3                     },
-    { Zplayer,                 EL_PLAYER_4                     },
-
-    { ZBORDER,                 EL_EMC_LEVEL_BORDER             },
-
-    { -1,                      -1                              }
-  };
-
-  if (!mapping_initialized)
-  {
-    int i;
-
-    /* return "Xalpha_quest" for all undefined elements in mapping array */
-    for (i = 0; i < NUM_FILE_ELEMENTS; i++)
-      mapping_RND_to_EM[i] = Xalpha_quest;
-
-    for (i = 0; mapping_RND_to_EM_list[i].element_rnd != -1; i++)
-      mapping_RND_to_EM[mapping_RND_to_EM_list[i].element_rnd] =
-       mapping_RND_to_EM_list[i].element_em;
-
-    mapping_initialized = TRUE;
-  }
-
-  if (element_rnd >= 0 && element_rnd < NUM_FILE_ELEMENTS)
-    return mapping_RND_to_EM[element_rnd];
-
-  Error(ERR_WARN, "invalid RND level element %d", element_rnd);
-
-  return EL_UNKNOWN;
-}
-
-int map_element_EM_to_RND(int element_em)
-{
-  static unsigned short mapping_EM_to_RND[TILE_MAX];
-  static boolean mapping_initialized = FALSE;
-
-  struct
-  {
-    int element_em;
-    int element_rnd;
-  }
-  em_object_mapping_list[] =
-  {
-    { Xblank,                  EL_EMPTY                        },
-    { Yacid_splash_eB,         EL_EMPTY                        },
-    { Yacid_splash_wB,         EL_EMPTY                        },
-
-#ifdef EM_ENGINE_BAD_ROLL
-    { Xstone_force_e,          EL_ROCK                         },
-    { Xstone_force_w,          EL_ROCK                         },
-    { Xnut_force_e,            EL_NUT                          },
-    { Xnut_force_w,            EL_NUT                          },
-    { Xspring_force_e,         EL_SPRING                       },
-    { Xspring_force_w,         EL_SPRING                       },
-    { Xemerald_force_e,                EL_EMERALD                      },
-    { Xemerald_force_w,                EL_EMERALD                      },
-    { Xdiamond_force_e,                EL_DIAMOND                      },
-    { Xdiamond_force_w,                EL_DIAMOND                      },
-    { Xbomb_force_e,           EL_BOMB                         },
-    { Xbomb_force_w,           EL_BOMB                         },
-#endif
-
-    { Xstone,                  EL_ROCK                         },
-    { Xstone_pause,            EL_ROCK                         },
-    { Xstone_fall,             EL_ROCK                         },
-    { Ystone_s,                        EL_ROCK                         },
-    { Ystone_sB,               EL_ROCK                         },
-    { Ystone_e,                        EL_ROCK                         },
-    { Ystone_eB,               EL_ROCK                         },
-    { Ystone_w,                        EL_ROCK                         },
-    { Ystone_wB,               EL_ROCK                         },
-    { Xnut,                    EL_NUT                          },
-    { Xnut_pause,              EL_NUT                          },
-    { Xnut_fall,               EL_NUT                          },
-    { Ynut_s,                  EL_NUT                          },
-    { Ynut_sB,                 EL_NUT                          },
-    { Ynut_e,                  EL_NUT                          },
-    { Ynut_eB,                 EL_NUT                          },
-    { Ynut_w,                  EL_NUT                          },
-    { Ynut_wB,                 EL_NUT                          },
-    { Xbug_n,                  EL_BUG_UP                       },
-    { Xbug_e,                  EL_BUG_RIGHT                    },
-    { Xbug_s,                  EL_BUG_DOWN                     },
-    { Xbug_w,                  EL_BUG_LEFT                     },
-    { Xbug_gon,                        EL_BUG_UP                       },
-    { Xbug_goe,                        EL_BUG_RIGHT                    },
-    { Xbug_gos,                        EL_BUG_DOWN                     },
-    { Xbug_gow,                        EL_BUG_LEFT                     },
-    { Ybug_n,                  EL_BUG_UP                       },
-    { Ybug_nB,                 EL_BUG_UP                       },
-    { Ybug_e,                  EL_BUG_RIGHT                    },
-    { Ybug_eB,                 EL_BUG_RIGHT                    },
-    { Ybug_s,                  EL_BUG_DOWN                     },
-    { Ybug_sB,                 EL_BUG_DOWN                     },
-    { Ybug_w,                  EL_BUG_LEFT                     },
-    { Ybug_wB,                 EL_BUG_LEFT                     },
-    { Ybug_w_n,                        EL_BUG_UP                       },
-    { Ybug_n_e,                        EL_BUG_RIGHT                    },
-    { Ybug_e_s,                        EL_BUG_DOWN                     },
-    { Ybug_s_w,                        EL_BUG_LEFT                     },
-    { Ybug_e_n,                        EL_BUG_UP                       },
-    { Ybug_s_e,                        EL_BUG_RIGHT                    },
-    { Ybug_w_s,                        EL_BUG_DOWN                     },
-    { Ybug_n_w,                        EL_BUG_LEFT                     },
-    { Ybug_stone,              EL_ROCK                         },
-    { Ybug_spring,             EL_SPRING                       },
-    { Xtank_n,                 EL_SPACESHIP_UP                 },
-    { Xtank_e,                 EL_SPACESHIP_RIGHT              },
-    { Xtank_s,                 EL_SPACESHIP_DOWN               },
-    { Xtank_w,                 EL_SPACESHIP_LEFT               },
-    { Xtank_gon,               EL_SPACESHIP_UP                 },
-    { Xtank_goe,               EL_SPACESHIP_RIGHT              },
-    { Xtank_gos,               EL_SPACESHIP_DOWN               },
-    { Xtank_gow,               EL_SPACESHIP_LEFT               },
-    { Ytank_n,                 EL_SPACESHIP_UP                 },
-    { Ytank_nB,                        EL_SPACESHIP_UP                 },
-    { Ytank_e,                 EL_SPACESHIP_RIGHT              },
-    { Ytank_eB,                        EL_SPACESHIP_RIGHT              },
-    { Ytank_s,                 EL_SPACESHIP_DOWN               },
-    { Ytank_sB,                        EL_SPACESHIP_DOWN               },
-    { Ytank_w,                 EL_SPACESHIP_LEFT               },
-    { Ytank_wB,                        EL_SPACESHIP_LEFT               },
-    { Ytank_w_n,               EL_SPACESHIP_UP                 },
-    { Ytank_n_e,               EL_SPACESHIP_RIGHT              },
-    { Ytank_e_s,               EL_SPACESHIP_DOWN               },
-    { Ytank_s_w,               EL_SPACESHIP_LEFT               },
-    { Ytank_e_n,               EL_SPACESHIP_UP                 },
-    { Ytank_s_e,               EL_SPACESHIP_RIGHT              },
-    { Ytank_w_s,               EL_SPACESHIP_DOWN               },
-    { Ytank_n_w,               EL_SPACESHIP_LEFT               },
-    { Ytank_stone,             EL_ROCK                         },
-    { Ytank_spring,            EL_SPRING                       },
-    { Xandroid,                        EL_EMC_ANDROID                  },
-    { Xandroid_1_n,            EL_EMC_ANDROID_UP               },
-    { Xandroid_2_n,            EL_EMC_ANDROID_UP               },
-    { Xandroid_1_e,            EL_EMC_ANDROID_RIGHT            },
-    { Xandroid_2_e,            EL_EMC_ANDROID_RIGHT            },
-    { Xandroid_1_w,            EL_EMC_ANDROID_LEFT             },
-    { Xandroid_2_w,            EL_EMC_ANDROID_LEFT             },
-    { Xandroid_1_s,            EL_EMC_ANDROID_DOWN             },
-    { Xandroid_2_s,            EL_EMC_ANDROID_DOWN             },
-    { Yandroid_n,              EL_EMC_ANDROID_UP               },
-    { Yandroid_nB,             EL_EMC_ANDROID_UP               },
-    { Yandroid_ne,             EL_EMC_ANDROID_RIGHT_UP         },
-    { Yandroid_neB,            EL_EMC_ANDROID_RIGHT_UP         },
-    { Yandroid_e,              EL_EMC_ANDROID_RIGHT            },
-    { Yandroid_eB,             EL_EMC_ANDROID_RIGHT            },
-    { Yandroid_se,             EL_EMC_ANDROID_RIGHT_DOWN       },
-    { Yandroid_seB,            EL_EMC_ANDROID_RIGHT_DOWN       },
-    { Yandroid_s,              EL_EMC_ANDROID_DOWN             },
-    { Yandroid_sB,             EL_EMC_ANDROID_DOWN             },
-    { Yandroid_sw,             EL_EMC_ANDROID_LEFT_DOWN        },
-    { Yandroid_swB,            EL_EMC_ANDROID_LEFT_DOWN        },
-    { Yandroid_w,              EL_EMC_ANDROID_LEFT             },
-    { Yandroid_wB,             EL_EMC_ANDROID_LEFT             },
-    { Yandroid_nw,             EL_EMC_ANDROID_LEFT_UP          },
-    { Yandroid_nwB,            EL_EMC_ANDROID_LEFT_UP          },
-    { Xspring,                 EL_SPRING                       },
-    { Xspring_pause,           EL_SPRING                       },
-    { Xspring_e,               EL_SPRING                       },
-    { Xspring_w,               EL_SPRING                       },
-    { Xspring_fall,            EL_SPRING                       },
-    { Yspring_s,               EL_SPRING                       },
-    { Yspring_sB,              EL_SPRING                       },
-    { Yspring_e,               EL_SPRING                       },
-    { Yspring_eB,              EL_SPRING                       },
-    { Yspring_w,               EL_SPRING                       },
-    { Yspring_wB,              EL_SPRING                       },
-    { Yspring_kill_e,          EL_SPRING                       },
-    { Yspring_kill_eB,         EL_SPRING                       },
-    { Yspring_kill_w,          EL_SPRING                       },
-    { Yspring_kill_wB,         EL_SPRING                       },
-    { Xeater_n,                        EL_YAMYAM                       },
-    { Xeater_e,                        EL_YAMYAM                       },
-    { Xeater_w,                        EL_YAMYAM                       },
-    { Xeater_s,                        EL_YAMYAM                       },
-    { Yeater_n,                        EL_YAMYAM                       },
-    { Yeater_nB,               EL_YAMYAM                       },
-    { Yeater_e,                        EL_YAMYAM                       },
-    { Yeater_eB,               EL_YAMYAM                       },
-    { Yeater_s,                        EL_YAMYAM                       },
-    { Yeater_sB,               EL_YAMYAM                       },
-    { Yeater_w,                        EL_YAMYAM                       },
-    { Yeater_wB,               EL_YAMYAM                       },
-    { Yeater_stone,            EL_ROCK                         },
-    { Yeater_spring,           EL_SPRING                       },
-    { Xalien,                  EL_ROBOT                        },
-    { Xalien_pause,            EL_ROBOT                        },
-    { Yalien_n,                        EL_ROBOT                        },
-    { Yalien_nB,               EL_ROBOT                        },
-    { Yalien_e,                        EL_ROBOT                        },
-    { Yalien_eB,               EL_ROBOT                        },
-    { Yalien_s,                        EL_ROBOT                        },
-    { Yalien_sB,               EL_ROBOT                        },
-    { Yalien_w,                        EL_ROBOT                        },
-    { Yalien_wB,               EL_ROBOT                        },
-    { Yalien_stone,            EL_ROCK                         },
-    { Yalien_spring,           EL_SPRING                       },
-    { Xemerald,                        EL_EMERALD                      },
-    { Xemerald_pause,          EL_EMERALD                      },
-    { Xemerald_fall,           EL_EMERALD                      },
-    { Xemerald_shine,          EL_EMERALD                      },
-    { Yemerald_s,              EL_EMERALD                      },
-    { Yemerald_sB,             EL_EMERALD                      },
-    { Yemerald_e,              EL_EMERALD                      },
-    { Yemerald_eB,             EL_EMERALD                      },
-    { Yemerald_w,              EL_EMERALD                      },
-    { Yemerald_wB,             EL_EMERALD                      },
-    { Yemerald_eat,            EL_EMERALD                      },
-    { Yemerald_stone,          EL_ROCK                         },
-    { Xdiamond,                        EL_DIAMOND                      },
-    { Xdiamond_pause,          EL_DIAMOND                      },
-    { Xdiamond_fall,           EL_DIAMOND                      },
-    { Xdiamond_shine,          EL_DIAMOND                      },
-    { Ydiamond_s,              EL_DIAMOND                      },
-    { Ydiamond_sB,             EL_DIAMOND                      },
-    { Ydiamond_e,              EL_DIAMOND                      },
-    { Ydiamond_eB,             EL_DIAMOND                      },
-    { Ydiamond_w,              EL_DIAMOND                      },
-    { Ydiamond_wB,             EL_DIAMOND                      },
-    { Ydiamond_eat,            EL_DIAMOND                      },
-    { Ydiamond_stone,          EL_ROCK                         },
-    { Xdrip_fall,              EL_AMOEBA_DROP                  },
-    { Xdrip_stretch,           EL_AMOEBA_DROP                  },
-    { Xdrip_stretchB,          EL_AMOEBA_DROP                  },
-    { Xdrip_eat,               EL_AMOEBA_DROP                  },
-    { Ydrip_s1,                        EL_AMOEBA_DROP                  },
-    { Ydrip_s1B,               EL_AMOEBA_DROP                  },
-    { Ydrip_s2,                        EL_AMOEBA_DROP                  },
-    { Ydrip_s2B,               EL_AMOEBA_DROP                  },
-    { Xbomb,                   EL_BOMB                         },
-    { Xbomb_pause,             EL_BOMB                         },
-    { Xbomb_fall,              EL_BOMB                         },
-    { Ybomb_s,                 EL_BOMB                         },
-    { Ybomb_sB,                        EL_BOMB                         },
-    { Ybomb_e,                 EL_BOMB                         },
-    { Ybomb_eB,                        EL_BOMB                         },
-    { Ybomb_w,                 EL_BOMB                         },
-    { Ybomb_wB,                        EL_BOMB                         },
-    { Ybomb_eat,               EL_BOMB                         },
-    { Xballoon,                        EL_BALLOON                      },
-    { Yballoon_n,              EL_BALLOON                      },
-    { Yballoon_nB,             EL_BALLOON                      },
-    { Yballoon_e,              EL_BALLOON                      },
-    { Yballoon_eB,             EL_BALLOON                      },
-    { Yballoon_s,              EL_BALLOON                      },
-    { Yballoon_sB,             EL_BALLOON                      },
-    { Yballoon_w,              EL_BALLOON                      },
-    { Yballoon_wB,             EL_BALLOON                      },
-    { Xgrass,                  EL_SAND                         },
-    { Ygrass_nB,               EL_SAND                         },
-    { Ygrass_eB,               EL_SAND                         },
-    { Ygrass_sB,               EL_SAND                         },
-    { Ygrass_wB,               EL_SAND                         },
-    { Xdirt,                   EL_SAND                         },
-    { Ydirt_nB,                        EL_SAND                         },
-    { Ydirt_eB,                        EL_SAND                         },
-    { Ydirt_sB,                        EL_SAND                         },
-    { Ydirt_wB,                        EL_SAND                         },
-    { Xacid_ne,                        EL_ACID_POOL_TOPRIGHT           },
-    { Xacid_se,                        EL_ACID_POOL_BOTTOMRIGHT        },
-    { Xacid_s,                 EL_ACID_POOL_BOTTOM             },
-    { Xacid_sw,                        EL_ACID_POOL_BOTTOMLEFT         },
-    { Xacid_nw,                        EL_ACID_POOL_TOPLEFT            },
-    { Xacid_1,                 EL_ACID                         },
-    { Xacid_2,                 EL_ACID                         },
-    { Xacid_3,                 EL_ACID                         },
-    { Xacid_4,                 EL_ACID                         },
-    { Xacid_5,                 EL_ACID                         },
-    { Xacid_6,                 EL_ACID                         },
-    { Xacid_7,                 EL_ACID                         },
-    { Xacid_8,                 EL_ACID                         },
-    { Xball_1,                 EL_EMC_MAGIC_BALL               },
-    { Xball_1B,                        EL_EMC_MAGIC_BALL               },
-    { Xball_2,                 EL_EMC_MAGIC_BALL               },
-    { Xball_2B,                        EL_EMC_MAGIC_BALL               },
-    { Yball_eat,               EL_EMC_MAGIC_BALL               },
-    { Xgrow_ns,                        EL_EMC_GROW                     },
-    { Ygrow_ns_eat,            EL_EMC_GROW                     },
-    { Xgrow_ew,                        EL_EMC_GROW                     },
-    { Ygrow_ew_eat,            EL_EMC_GROW                     },
-    { Xwonderwall,             EL_MAGIC_WALL                   },
-    { XwonderwallB,            EL_MAGIC_WALL                   },
-    { Xamoeba_1,               EL_AMOEBA_WET                   },
-    { Xamoeba_2,               EL_AMOEBA_WET                   },
-    { Xamoeba_3,               EL_AMOEBA_WET                   },
-    { Xamoeba_4,               EL_AMOEBA_WET                   },
-    { Xamoeba_5,               EL_AMOEBA_WET                   },
-    { Xamoeba_6,               EL_AMOEBA_WET                   },
-    { Xamoeba_7,               EL_AMOEBA_WET                   },
-    { Xamoeba_8,               EL_AMOEBA_WET                   },
-    { Xdoor_1,                 EL_EM_GATE_1                    },
-    { Xdoor_2,                 EL_EM_GATE_2                    },
-    { Xdoor_3,                 EL_EM_GATE_3                    },
-    { Xdoor_4,                 EL_EM_GATE_4                    },
-    { Xdoor_5,                 EL_EMC_GATE_5                   },
-    { Xdoor_6,                 EL_EMC_GATE_6                   },
-    { Xdoor_7,                 EL_EMC_GATE_7                   },
-    { Xdoor_8,                 EL_EMC_GATE_8                   },
-    { Xkey_1,                  EL_EM_KEY_1                     },
-    { Xkey_2,                  EL_EM_KEY_2                     },
-    { Xkey_3,                  EL_EM_KEY_3                     },
-    { Xkey_4,                  EL_EM_KEY_4                     },
-    { Xkey_5,                  EL_EMC_KEY_5                    },
-    { Xkey_6,                  EL_EMC_KEY_6                    },
-    { Xkey_7,                  EL_EMC_KEY_7                    },
-    { Xkey_8,                  EL_EMC_KEY_8                    },
-    { Xwind_n,                 EL_BALLOON_SWITCH_UP            },
-    { Xwind_e,                 EL_BALLOON_SWITCH_RIGHT         },
-    { Xwind_s,                 EL_BALLOON_SWITCH_DOWN          },
-    { Xwind_w,                 EL_BALLOON_SWITCH_LEFT          },
-    { Xwind_nesw,              EL_BALLOON_SWITCH_ANY           },
-    { Xwind_stop,              EL_BALLOON_SWITCH_NONE          },
-    { Xexit,                   EL_EXIT_CLOSED                  },
-    { Xexit_1,                 EL_EXIT_OPEN                    },
-    { Xexit_2,                 EL_EXIT_OPEN                    },
-    { Xexit_3,                 EL_EXIT_OPEN                    },
-    { Xdynamite,               EL_DYNAMITE                     },
-    { Ydynamite_eat,           EL_DYNAMITE                     },
-    { Xdynamite_1,             EL_DYNAMITE_ACTIVE              },
-    { Xdynamite_2,             EL_DYNAMITE_ACTIVE              },
-    { Xdynamite_3,             EL_DYNAMITE_ACTIVE              },
-    { Xdynamite_4,             EL_DYNAMITE_ACTIVE              },
-    { Xbumper,                 EL_EMC_BUMPER                   },
-    { XbumperB,                        EL_EMC_BUMPER                   },
-    { Xwheel,                  EL_ROBOT_WHEEL                  },
-    { XwheelB,                 EL_ROBOT_WHEEL                  },
-    { Xswitch,                 EL_UNKNOWN                      },
-    { XswitchB,                        EL_UNKNOWN                      },
-    { Xsand,                   EL_QUICKSAND_EMPTY              },
-    { Xsand_stone,             EL_QUICKSAND_FULL               },
-    { Xsand_stonein_1,         EL_QUICKSAND_FULL               },
-    { Xsand_stonein_2,         EL_QUICKSAND_FULL               },
-    { Xsand_stonein_3,         EL_QUICKSAND_FULL               },
-    { Xsand_stonein_4,         EL_QUICKSAND_FULL               },
-    { Xsand_stonesand_1,       EL_QUICKSAND_FULL               },
-    { Xsand_stonesand_2,       EL_QUICKSAND_FULL               },
-    { Xsand_stonesand_3,       EL_QUICKSAND_FULL               },
-    { Xsand_stonesand_4,       EL_QUICKSAND_FULL               },
-    { Xsand_stoneout_1,                EL_QUICKSAND_FULL               },
-    { Xsand_stoneout_2,                EL_QUICKSAND_FULL               },
-    { Xsand_sandstone_1,       EL_QUICKSAND_FULL               },
-    { Xsand_sandstone_2,       EL_QUICKSAND_FULL               },
-    { Xsand_sandstone_3,       EL_QUICKSAND_FULL               },
-    { Xsand_sandstone_4,       EL_QUICKSAND_FULL               },
-    { Xplant,                  EL_EMC_PLANT                    },
-    { Yplant,                  EL_EMC_PLANT                    },
-    { Xlenses,                 EL_EMC_LENSES                   },
-    { Xmagnify,                        EL_EMC_MAGNIFIER                },
-    { Xdripper,                        EL_UNKNOWN                      },
-    { XdripperB,               EL_UNKNOWN                      },
-    { Xfake_blank,             EL_INVISIBLE_WALL               },
-    { Xfake_blankB,            EL_INVISIBLE_WALL               },
-    { Xfake_grass,             EL_INVISIBLE_SAND               },
-    { Xfake_grassB,            EL_INVISIBLE_SAND               },
-    { Xfake_door_1,            EL_EM_GATE_1_GRAY               },
-    { Xfake_door_2,            EL_EM_GATE_2_GRAY               },
-    { Xfake_door_3,            EL_EM_GATE_3_GRAY               },
-    { Xfake_door_4,            EL_EM_GATE_4_GRAY               },
-    { Xfake_door_5,            EL_EMC_GATE_5_GRAY              },
-    { Xfake_door_6,            EL_EMC_GATE_6_GRAY              },
-    { Xfake_door_7,            EL_EMC_GATE_7_GRAY              },
-    { Xfake_door_8,            EL_EMC_GATE_8_GRAY              },
-    { Xsteel_1,                        EL_STEELWALL                    },
-    { Xsteel_2,                        EL_UNKNOWN                      },
-    { Xsteel_3,                        EL_EMC_STEELWALL_1              },
-    { Xsteel_4,                        EL_UNKNOWN                      },
-    { Xwall_1,                 EL_WALL                         },
-    { Xwall_2,                 EL_UNKNOWN                      },
-    { Xwall_3,                 EL_UNKNOWN                      },
-    { Xwall_4,                 EL_UNKNOWN                      },
-    { Xround_wall_1,           EL_WALL_SLIPPERY                },
-    { Xround_wall_2,           EL_UNKNOWN                      },
-    { Xround_wall_3,           EL_UNKNOWN                      },
-    { Xround_wall_4,           EL_UNKNOWN                      },
-    { Xdecor_1,                        EL_UNKNOWN                      },
-    { Xdecor_2,                        EL_EMC_WALL_6                   },
-    { Xdecor_3,                        EL_EMC_WALL_4                   },
-    { Xdecor_4,                        EL_EMC_WALL_5                   },
-    { Xdecor_5,                        EL_EMC_WALL_7                   },
-    { Xdecor_6,                        EL_EMC_WALL_8                   },
-    { Xdecor_7,                        EL_UNKNOWN                      },
-    { Xdecor_8,                        EL_EMC_WALL_1                   },
-    { Xdecor_9,                        EL_EMC_WALL_2                   },
-    { Xdecor_10,               EL_EMC_WALL_3                   },
-    { Xdecor_11,               EL_UNKNOWN                      },
-    { Xdecor_12,               EL_UNKNOWN                      },
-    { Xalpha_0,                        EL_CHAR('0')                    },
-    { Xalpha_1,                        EL_CHAR('1')                    },
-    { Xalpha_2,                        EL_CHAR('2')                    },
-    { Xalpha_3,                        EL_CHAR('3')                    },
-    { Xalpha_4,                        EL_CHAR('4')                    },
-    { Xalpha_5,                        EL_CHAR('5')                    },
-    { Xalpha_6,                        EL_CHAR('6')                    },
-    { Xalpha_7,                        EL_CHAR('7')                    },
-    { Xalpha_8,                        EL_CHAR('8')                    },
-    { Xalpha_9,                        EL_CHAR('9')                    },
-    { Xalpha_excla,            EL_CHAR('!')                    },
-    { Xalpha_quote,            EL_CHAR('"')                    },
-    { Xalpha_comma,            EL_CHAR(',')                    },
-    { Xalpha_minus,            EL_CHAR('-')                    },
-    { Xalpha_perio,            EL_CHAR('.')                    },
-    { Xalpha_colon,            EL_CHAR(':')                    },
-    { Xalpha_quest,            EL_CHAR('?')                    },
-    { Xalpha_a,                        EL_CHAR('A')                    },
-    { Xalpha_b,                        EL_CHAR('B')                    },
-    { Xalpha_c,                        EL_CHAR('C')                    },
-    { Xalpha_d,                        EL_CHAR('D')                    },
-    { Xalpha_e,                        EL_CHAR('E')                    },
-    { Xalpha_f,                        EL_CHAR('F')                    },
-    { Xalpha_g,                        EL_CHAR('G')                    },
-    { Xalpha_h,                        EL_CHAR('H')                    },
-    { Xalpha_i,                        EL_CHAR('I')                    },
-    { Xalpha_j,                        EL_CHAR('J')                    },
-    { Xalpha_k,                        EL_CHAR('K')                    },
-    { Xalpha_l,                        EL_CHAR('L')                    },
-    { Xalpha_m,                        EL_CHAR('M')                    },
-    { Xalpha_n,                        EL_CHAR('N')                    },
-    { Xalpha_o,                        EL_CHAR('O')                    },
-    { Xalpha_p,                        EL_CHAR('P')                    },
-    { Xalpha_q,                        EL_CHAR('Q')                    },
-    { Xalpha_r,                        EL_CHAR('R')                    },
-    { Xalpha_s,                        EL_CHAR('S')                    },
-    { Xalpha_t,                        EL_CHAR('T')                    },
-    { Xalpha_u,                        EL_CHAR('U')                    },
-    { Xalpha_v,                        EL_CHAR('V')                    },
-    { Xalpha_w,                        EL_CHAR('W')                    },
-    { Xalpha_x,                        EL_CHAR('X')                    },
-    { Xalpha_y,                        EL_CHAR('Y')                    },
-    { Xalpha_z,                        EL_CHAR('Z')                    },
-    { Xalpha_arrow_e,          EL_CHAR('>')                    },
-    { Xalpha_arrow_w,          EL_CHAR('<')                    },
-    { Xalpha_copyr,            EL_CHAR('©')                    },
-
-    { Zplayer,                 EL_PLAYER_1                     },
-
-    { ZBORDER,                 EL_EMC_LEVEL_BORDER             },
-
-    { -1,                      -1                              }
-  };
-
-  if (!mapping_initialized)
-  {
-    int i;
-
-    /* return "EL_UNKNOWN" for all undefined elements in mapping array */
-    for (i = 0; i < TILE_MAX; i++)
-      mapping_EM_to_RND[i] = EL_UNKNOWN;
-
-    for (i = 0; em_object_mapping_list[i].element_em != -1; i++)
-      mapping_EM_to_RND[em_object_mapping_list[i].element_em] =
-       em_object_mapping_list[i].element_rnd;
-
-    mapping_initialized = TRUE;
-  }
-
-  if (element_em >= 0 && element_em < TILE_MAX)
-    return mapping_EM_to_RND[element_em];
-
-  Error(ERR_WARN, "invalid EM level element %d", element_em);
-
-  return EL_UNKNOWN;
-}
-
-#endif
-
 int map_direction_RND_to_EM(int direction)
 {
   return (direction == MV_UP    ? 0 :
@@ -5731,6 +5196,53 @@ int font2baseimg(int font_nr)
   return font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT];
 }
 
+#if 0
+void setCenteredPlayerNr_EM(int centered_player_nr)
+{
+  game.centered_player_nr = game.centered_player_nr_next = centered_player_nr;
+}
+
+int getCenteredPlayerNr_EM()
+{
+#if 0
+  if (game.centered_player_nr_next >= 0 &&
+      !native_em_level.ply[game.centered_player_nr_next]->alive)
+    game.centered_player_nr_next = game.centered_player_nr;
+#endif
+
+  if (game.centered_player_nr != game.centered_player_nr_next)
+    game.centered_player_nr = game.centered_player_nr_next;
+
+  return game.centered_player_nr;
+}
+
+void setSetCenteredPlayer_EM(boolean set_centered_player)
+{
+  game.set_centered_player = set_centered_player;
+}
+
+boolean getSetCenteredPlayer_EM()
+{
+  return game.set_centered_player;
+}
+#endif
+
+int getNumActivePlayers_EM()
+{
+  int num_players = 0;
+  int i;
+
+  if (!tape.playing)
+    return -1;
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+    if (tape.player_participates[i])
+      num_players++;
+
+  return num_players;
+}
+
+#if 1
 int getGameFrameDelay_EM(int native_em_game_frame_delay)
 {
   int game_frame_delay_value;
@@ -5745,6 +5257,7 @@ int getGameFrameDelay_EM(int native_em_game_frame_delay)
 
   return game_frame_delay_value;
 }
+#endif
 
 unsigned int InitRND(long seed)
 {
@@ -5754,8 +5267,6 @@ unsigned int InitRND(long seed)
     return InitEngineRND(seed);
 }
 
-#define DEBUG_EM_GFX   0
-
 void InitGraphicInfo_EM(void)
 {
   struct Mapping_EM_to_RND_object object_mapping[TILE_MAX];
@@ -5763,12 +5274,16 @@ void InitGraphicInfo_EM(void)
   int i, j, p;
 
 #if DEBUG_EM_GFX
+  int num_em_gfx_errors = 0;
+
   if (graphic_info_em_object[0][0].bitmap == NULL)
   {
     /* EM graphics not yet initialized in em_open_all() */
 
     return;
   }
+
+  printf("::: [4 errors can be ignored (1 x 'bomb', 3 x 'em_dynamite']\n");
 #endif
 
   /* always start with reliable default values */
@@ -5862,12 +5377,12 @@ void InitGraphicInfo_EM(void)
                               i == Ymagnify_eat ? element :
                               i == Ygrass_eat ? element :
                               i == Ydirt_eat ? element :
-                              i == Yspring_kill_e ? EL_SPRING :
-                              i == Yspring_kill_w ? EL_SPRING :
                               i == Yemerald_stone ? EL_EMERALD :
                               i == Ydiamond_stone ? EL_ROCK :
-                              i == Xsand_stonein_4 ? EL_EMPTY :
-                              i == Xsand_stoneout_2 ? EL_ROCK :
+                              i == Xsand_stonein_1 ? element :
+                              i == Xsand_stonein_2 ? element :
+                              i == Xsand_stonein_3 ? element :
+                              i == Xsand_stonein_4 ? element :
                               is_backside ? EL_EMPTY :
                               action_removing ? EL_EMPTY :
                               element);
@@ -5909,6 +5424,7 @@ void InitGraphicInfo_EM(void)
                                     direction));
       int base_graphic = el_act2img(effective_element, ACTION_DEFAULT);
       int base_crumbled = el_act2crm(effective_element, ACTION_DEFAULT);
+      boolean has_action_graphics = (graphic != base_graphic);
       boolean has_crumbled_graphics = (base_crumbled != base_graphic);
       struct GraphicInfo *g = &graphic_info[graphic];
       struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j];
@@ -5965,9 +5481,9 @@ void InitGraphicInfo_EM(void)
                        i == Xexit_2 ? j + 8 :
                        i == Xexit_3 ? j + 16 :
                        i == Xdynamite_1 ? 0 :
-                       i == Xdynamite_2 ? 20 :
-                       i == Xdynamite_3 ? 40 :
-                       i == Xdynamite_4 ? 60 :
+                       i == Xdynamite_2 ? 8 :
+                       i == Xdynamite_3 ? 16 :
+                       i == Xdynamite_4 ? 24 :
                        i == Xsand_stonein_1 ? j + 1 :
                        i == Xsand_stonein_2 ? j + 9 :
                        i == Xsand_stonein_3 ? j + 17 :
@@ -6076,22 +5592,43 @@ void InitGraphicInfo_EM(void)
        g_em->crumbled_border_size = graphic_info[crumbled].border_size;
       }
 
-      if (!g->double_movement && (effective_action == ACTION_FALLING ||
-                                 effective_action == ACTION_MOVING ||
-                                 effective_action == ACTION_PUSHING))
+#if 0
+      if (element == EL_ROCK &&
+         effective_action == ACTION_FILLING)
+       printf("::: has_action_graphics == %d\n", has_action_graphics);
+#endif
+
+      if ((!g->double_movement && (effective_action == ACTION_FALLING ||
+                                  effective_action == ACTION_MOVING  ||
+                                  effective_action == ACTION_PUSHING ||
+                                  effective_action == ACTION_EATING)) ||
+         (!has_action_graphics && (effective_action == ACTION_FILLING ||
+                                   effective_action == ACTION_EMPTYING)))
       {
        int move_dir =
-         (effective_action == ACTION_FALLING ? MV_DOWN : direction);
+         (effective_action == ACTION_FALLING ||
+          effective_action == ACTION_FILLING ||
+          effective_action == ACTION_EMPTYING ? MV_DOWN : direction);
        int dx = (move_dir == MV_LEFT ? -1 : move_dir == MV_RIGHT ? 1 : 0);
        int dy = (move_dir == MV_UP   ? -1 : move_dir == MV_DOWN  ? 1 : 0);
-       int num_steps = (i == Ydrip_s1 ||
-                        i == Ydrip_s1B ||
-                        i == Ydrip_s2 ||
-                        i == Ydrip_s2B ? 16 : 8);
+       int num_steps = (i == Ydrip_s1  ? 16 :
+                        i == Ydrip_s1B ? 16 :
+                        i == Ydrip_s2  ? 16 :
+                        i == Ydrip_s2B ? 16 :
+                        i == Xsand_stonein_1 ? 32 :
+                        i == Xsand_stonein_2 ? 32 :
+                        i == Xsand_stonein_3 ? 32 :
+                        i == Xsand_stonein_4 ? 32 :
+                        i == Xsand_stoneout_1 ? 16 :
+                        i == Xsand_stoneout_2 ? 16 : 8);
        int cx = ABS(dx) * (TILEX / num_steps);
        int cy = ABS(dy) * (TILEY / num_steps);
-       int step_frame = (i == Ydrip_s2 ||
-                         i == Ydrip_s2B ? j + 8 : j) + 1;
+       int step_frame = (i == Ydrip_s2         ? j + 8 :
+                         i == Ydrip_s2B        ? j + 8 :
+                         i == Xsand_stonein_2  ? j + 8 :
+                         i == Xsand_stonein_3  ? j + 16 :
+                         i == Xsand_stonein_4  ? j + 24 :
+                         i == Xsand_stoneout_2 ? j + 8 : j) + 1;
        int step = (is_backside ? step_frame : num_steps - step_frame);
 
        if (is_backside)        /* tile where movement starts */
@@ -6213,6 +5750,8 @@ void InitGraphicInfo_EM(void)
          printf("    %d (%d): size %d,%d should be %d,%d\n",
                 j, is_backside,
                 g_em->width, g_em->height, TILEX, TILEY);
+
+       num_em_gfx_errors++;
       }
 #endif
 
@@ -6225,14 +5764,30 @@ void InitGraphicInfo_EM(void)
     {
       int element = object_mapping[i].element_rnd;
       int action = object_mapping[i].action;
+      int direction = object_mapping[i].direction;
+      boolean is_backside = object_mapping[i].is_backside;
+#if 1
+      int graphic_action  = el_act_dir2img(element, action, direction);
+      int graphic_default = el_act_dir2img(element, ACTION_DEFAULT, direction);
+#else
+      int graphic_action  = element_info[element].graphic[action];
+      int graphic_default = element_info[element].graphic[ACTION_DEFAULT];
+#endif
 
-      if (action == ACTION_SMASHED_BY_ROCK &&
-         element_info[element].graphic[action] ==
-         element_info[element].graphic[ACTION_DEFAULT])
+      if ((action == ACTION_SMASHED_BY_ROCK ||
+          action == ACTION_SMASHED_BY_SPRING ||
+          action == ACTION_EATING) &&
+         graphic_action == graphic_default)
       {
+       int e = (action == ACTION_SMASHED_BY_ROCK   ? Ystone_s  :
+                action == ACTION_SMASHED_BY_SPRING ? Yspring_s :
+                direction == MV_LEFT  ? (is_backside? Yspring_wB: Yspring_w) :
+                direction == MV_RIGHT ? (is_backside? Yspring_eB: Yspring_e) :
+                Xspring);
+
        /* no separate animation for "smashed by rock" -- use rock instead */
        struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j];
-       struct GraphicInfo_EM *g_xx = &graphic_info_em_object[Ystone_s][7 - j];
+       struct GraphicInfo_EM *g_xx = &graphic_info_em_object[e][7 - j];
 
        g_em->bitmap            = g_xx->bitmap;
        g_em->src_x             = g_xx->src_x;
@@ -6243,8 +5798,12 @@ void InitGraphicInfo_EM(void)
        g_em->dst_offset_y      = g_xx->dst_offset_y;
        g_em->width             = g_xx->width;
        g_em->height            = g_xx->height;
+#if 1
+       g_em->unique_identifier = g_xx->unique_identifier;
+#endif
 
-       g_em->preserve_background = TRUE;
+       if (!is_backside)
+         g_em->preserve_background = TRUE;
       }
     }
   }
@@ -6296,6 +5855,14 @@ void InitGraphicInfo_EM(void)
        g_em->height = TILEY;
 
 #if DEBUG_EM_GFX
+
+#if 1
+       /* skip check for EMC elements not contained in original EMC artwork */
+       if (element == EL_PLAYER_3 ||
+           element == EL_PLAYER_4)
+         continue;
+#endif
+
        if (g_em->bitmap != debug_bitmap ||
            g_em->src_x != debug_src_x ||
            g_em->src_y != debug_src_y)
@@ -6331,6 +5898,8 @@ void InitGraphicInfo_EM(void)
                   g_em->src_x / 32, g_em->src_y / 32,
                   debug_src_x, debug_src_y,
                   debug_src_x / 32, debug_src_y / 32);
+
+         num_em_gfx_errors++;
        }
 #endif
 
@@ -6339,6 +5908,66 @@ void InitGraphicInfo_EM(void)
   }
 
 #if DEBUG_EM_GFX
+  printf("\n");
+  printf("::: [%d errors found]\n", num_em_gfx_errors);
+
   exit(0);
 #endif
 }
+
+void PlayMenuSound()
+{
+  int sound = menu.sound[game_status];
+
+  if (sound == SND_UNDEFINED)
+    return;
+
+  if ((!setup.sound_simple && !IS_LOOP_SOUND(sound)) ||
+      (!setup.sound_loops && IS_LOOP_SOUND(sound)))
+    return;
+
+  if (IS_LOOP_SOUND(sound))
+    PlaySoundLoop(sound);
+  else
+    PlaySound(sound);
+}
+
+void PlayMenuSoundStereo(int sound, int stereo_position)
+{
+  if (sound == SND_UNDEFINED)
+    return;
+
+  if ((!setup.sound_simple && !IS_LOOP_SOUND(sound)) ||
+      (!setup.sound_loops && IS_LOOP_SOUND(sound)))
+    return;
+
+  if (IS_LOOP_SOUND(sound))
+    PlaySoundExt(sound, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_LOOP);
+  else
+    PlaySoundStereo(sound, stereo_position);
+}
+
+void PlayMenuSoundIfLoop()
+{
+  int sound = menu.sound[game_status];
+
+  if (sound == SND_UNDEFINED)
+    return;
+
+  if ((!setup.sound_simple && !IS_LOOP_SOUND(sound)) ||
+      (!setup.sound_loops && IS_LOOP_SOUND(sound)))
+    return;
+
+  if (IS_LOOP_SOUND(sound))
+    PlaySoundLoop(sound);
+}
+
+void PlayMenuMusic()
+{
+  int music = menu.music[game_status];
+
+  if (music == MUS_UNDEFINED)
+    return;
+
+  PlayMusic(music);
+}