added handling 64-bit random value bug with old tapes in EM engine

[rocksndiamonds.git] / src / game_em / logic.c

diff --git a/src/game_em/logic.c b/src/game_em/logic.c
index d126415b774a3e8357a72a3189386f613a6b5cb7..ba823a0ca86b20e6855ad35ba49d80862e5b36e6 100644 (file)
--- a/src/game_em/logic.c
+++ b/src/game_em/logic.c
@@ -9,15 +9,112 @@
 
 
 #define SPRING_ROLL    /* spring rolling off round things continues to roll */
-#define USE_CHANGED_ACID_STUFF
+#define ACID_ROLL      /* rolling objects go into acid rather than remove it */
+#define ACID_PLAYER    /* player gets killed by acid, but without explosion */
 
-#define RANDOM_RAW     (seed = seed << 31 | seed >> 1)
-#define RANDOM(x)      (RANDOM_RAW & (x - 1))
+#define RANDOM_BUG     /* handle problem with old tapes using 64-bit random */
+
+#define RANDOM(x)      ((seed = seed << 31 | seed >> 1) % x)
 
 static short **cave, **next, **boom;
 static unsigned int seed;
 static int score;
 
+static const byte is_blank[GAME_TILE_MAX] =
+{
+  [Xblank]             = 1,
+  [Xsplash_e]          = 1,
+  [Xsplash_w]          = 1,
+  [Xfake_acid_1]       = 1,
+  [Xfake_acid_2]       = 1,
+  [Xfake_acid_3]       = 1,
+  [Xfake_acid_4]       = 1,
+  [Xfake_acid_5]       = 1,
+  [Xfake_acid_6]       = 1,
+  [Xfake_acid_7]       = 1,
+  [Xfake_acid_8]       = 1
+};
+
+static const byte is_blank_or_acid[GAME_TILE_MAX] =
+{
+  [Xblank]             = 1,
+  [Xsplash_e]          = 1,
+  [Xsplash_w]          = 1,
+  [Xfake_acid_1]       = 1,
+  [Xfake_acid_2]       = 1,
+  [Xfake_acid_3]       = 1,
+  [Xfake_acid_4]       = 1,
+  [Xfake_acid_5]       = 1,
+  [Xfake_acid_6]       = 1,
+  [Xfake_acid_7]       = 1,
+  [Xfake_acid_8]       = 1,
+  [Xacid_1]            = 1,
+  [Xacid_2]            = 1,
+  [Xacid_3]            = 1,
+  [Xacid_4]            = 1,
+  [Xacid_5]            = 1,
+  [Xacid_6]            = 1,
+  [Xacid_7]            = 1,
+  [Xacid_8]            = 1
+};
+
+static const byte is_fake_acid[GAME_TILE_MAX] =
+{
+  [Xfake_acid_1]       = 1,
+  [Xfake_acid_2]       = 1,
+  [Xfake_acid_3]       = 1,
+  [Xfake_acid_4]       = 1,
+  [Xfake_acid_5]       = 1,
+  [Xfake_acid_6]       = 1,
+  [Xfake_acid_7]       = 1,
+  [Xfake_acid_8]       = 1
+};
+
+static const byte is_amoeba[GAME_TILE_MAX] =
+{
+  [Xfake_amoeba]       = 1,
+  [Yfake_amoeba]       = 1,
+  [Xamoeba_1]          = 1,
+  [Xamoeba_2]          = 1,
+  [Xamoeba_3]          = 1,
+  [Xamoeba_4]          = 1,
+  [Xamoeba_5]          = 1,
+  [Xamoeba_6]          = 1,
+  [Xamoeba_7]          = 1,
+  [Xamoeba_8]          = 1
+};
+
+static byte is_android_blank[GAME_TILE_MAX] =
+{
+  [Xblank]             = 1,
+  [Xsplash_e]          = 1,
+  [Xsplash_w]          = 1,
+  [Xfake_acid_1]       = 1,
+  [Xfake_acid_2]       = 1,
+  [Xfake_acid_3]       = 1,
+  [Xfake_acid_4]       = 1,
+  [Xfake_acid_5]       = 1,
+  [Xfake_acid_6]       = 1,
+  [Xfake_acid_7]       = 1,
+  [Xfake_acid_8]       = 1
+};
+
+static const byte is_android_walkable[GAME_TILE_MAX] =
+{
+  [Xblank]             = 1,
+  [Xsplash_e]          = 1,
+  [Xsplash_w]          = 1,
+  [Xfake_acid_1]       = 1,
+  [Xfake_acid_2]       = 1,
+  [Xfake_acid_3]       = 1,
+  [Xfake_acid_4]       = 1,
+  [Xfake_acid_5]       = 1,
+  [Xfake_acid_6]       = 1,
+  [Xfake_acid_7]       = 1,
+  [Xfake_acid_8]       = 1,
+  [Xplant]             = 1
+};
+
 static void Lboom_generic(int x, int y, int element, int element_middle)
 {
   boom[x-1][y-1] = element;
@@ -31,31 +128,34 @@ static void Lboom_generic(int x, int y, int element, int element_middle)
   boom[x+1][y+1] = element;
 }
 
-static void Lboom_bug(int x, int y, int by_element)
+static void Lboom_bug(int x, int y)
 {
-  next[x][y] = Znormal;
+  if (game_em.use_old_explosions)
+    next[x][y] = Zbug;
 
   Lboom_generic(x, y, Xemerald, Xdiamond);
 
 #if PLAY_ELEMENT_SOUND
-  play_element_sound(x, y, SOUND_boom, by_element);
+  play_element_sound(x, y, SOUND_boom, Xbug_1_n);
 #endif
 }
 
-static void Lboom_tank(int x, int y, int by_element)
+static void Lboom_tank(int x, int y)
 {
-  next[x][y] = Znormal;
+  if (game_em.use_old_explosions)
+    next[x][y] = Ztank;
 
   Lboom_generic(x, y, Xblank, Xblank);
 
 #if PLAY_ELEMENT_SOUND
-  play_element_sound(x, y, SOUND_boom, by_element);
+  play_element_sound(x, y, SOUND_boom, Xtank_1_n);
 #endif
 }
 
-static void Lboom_eater(int x, int y, int by_element)
+static void Lboom_eater(int x, int y)
 {
-  next[x][y] = Znormal;
+  if (game_em.use_old_explosions)
+    next[x][y] = Zeater;
 
   boom[x-1][y-1] = lev.eater_array[lev.eater_pos][0];
   boom[x][y-1]   = lev.eater_array[lev.eater_pos][1];
@@ -67,13 +167,95 @@ static void Lboom_eater(int x, int y, int by_element)
   boom[x][y+1]   = lev.eater_array[lev.eater_pos][7];
   boom[x+1][y+1] = lev.eater_array[lev.eater_pos][8];
 
-  lev.eater_pos = (lev.eater_pos + 1) & 7;
+  lev.eater_pos = (lev.eater_pos + 1) % lev.num_eater_arrays;
 
 #if PLAY_ELEMENT_SOUND
-  play_element_sound(x, y, SOUND_boom, by_element);
+  play_element_sound(x, y, SOUND_boom, Xeater_n);
 #endif
 }
 
+static void Lboom_bug_old(int x, int y)
+{
+  if (!game_em.use_old_explosions)
+    return;
+
+  Lboom_bug(x, y);
+}
+
+static void Lboom_tank_old(int x, int y)
+{
+  if (!game_em.use_old_explosions)
+    return;
+
+  Lboom_tank(x, y);
+}
+
+static void Lboom_eater_old(int x, int y)
+{
+  if (!game_em.use_old_explosions)
+    return;
+
+  Lboom_eater(x, y);
+}
+
+static void Lboom_bug_new(int x, int y, boolean chain_explosion)
+{
+  if (game_em.use_old_explosions)
+    return;
+
+  if (chain_explosion)
+    cave[x][y] = Xchain;
+
+  Lboom_bug(x, y);
+}
+
+static void Lboom_tank_new(int x, int y, boolean chain_explosion)
+{
+  if (game_em.use_old_explosions)
+    return;
+
+  if (chain_explosion)
+    cave[x][y] = Xchain;
+
+  Lboom_tank(x, y);
+}
+
+static void Lboom_eater_new(int x, int y, boolean chain_explosion)
+{
+  if (game_em.use_old_explosions)
+    return;
+
+  if (chain_explosion)
+    cave[x][y] = Xchain;
+
+  Lboom_eater(x, y);
+}
+
+static void Lboom_cave_new(int x, int y, int element)
+{
+  if (game_em.use_old_explosions)
+    return;
+
+  cave[x][y] = element;
+}
+
+static void Lboom_next_new(int x, int y, int element)
+{
+  if (game_em.use_old_explosions)
+    return;
+
+  next[x][y] = element;
+}
+
+static void Lpush_element_old(int x, int y, int element)
+{
+  if (!game_em.use_old_push_elements)
+    return;
+
+  cave[x][y] = element;
+  next[x][y] = element;
+}
+
 static boolean player_killed(struct PLAYER *ply)
 {
   int x = ply->x;
@@ -171,15 +353,10 @@ static boolean player_killed(struct PLAYER *ply)
 
   switch (cave[x][y])
   {
-    case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
     case Zplayer:
-    case Xdynamite_1:
-    case Xdynamite_2:
-    case Xdynamite_3:
-    case Xdynamite_4:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xblank:
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -188,7 +365,10 @@ static boolean player_killed(struct PLAYER *ply)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
+    case Xdynamite_1:
+    case Xdynamite_2:
+    case Xdynamite_3:
+    case Xdynamite_4:
       return FALSE;
   }
 
@@ -200,7 +380,7 @@ static void kill_player(struct PLAYER *ply)
   int x = ply->x;
   int y = ply->y;
 
-  ply->alive = 0;
+  ply->alive = FALSE;
 
   switch (cave[x][y-1])
   {
@@ -213,6 +393,7 @@ static void kill_player(struct PLAYER *ply)
     case Xbug_2_s:
     case Xbug_2_w:
       cave[x][y-1] = Xboom_bug;
+      Lboom_bug_new(x, y-1, TRUE);
       break;
 
     case Xtank_1_n:
@@ -223,7 +404,8 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_2_e:
     case Xtank_2_s:
     case Xtank_2_w:
-      cave[x][y-1] = Xboom_bomb;
+      cave[x][y-1] = Xboom_tank;
+      Lboom_tank_new(x, y-1, TRUE);
       break;
   }
 
@@ -238,6 +420,7 @@ static void kill_player(struct PLAYER *ply)
     case Xbug_2_s:
     case Xbug_2_w:
       cave[x+1][y] = Xboom_bug;
+      Lboom_bug_new(x+1, y, TRUE);
       break;
 
     case Xtank_1_n:
@@ -248,7 +431,8 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_2_e:
     case Xtank_2_s:
     case Xtank_2_w:
-      cave[x+1][y] = Xboom_bomb;
+      cave[x+1][y] = Xboom_tank;
+      Lboom_tank_new(x+1, y, TRUE);
       break;
   }
 
@@ -263,6 +447,7 @@ static void kill_player(struct PLAYER *ply)
     case Xbug_2_s:
     case Xbug_2_w:
       cave[x][y+1] = Xboom_bug;
+      Lboom_bug_new(x, y+1, TRUE);
       break;
 
     case Xtank_1_n:
@@ -273,7 +458,8 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_2_e:
     case Xtank_2_s:
     case Xtank_2_w:
-      cave[x][y+1] = Xboom_bomb;
+      cave[x][y+1] = Xboom_tank;
+      Lboom_tank_new(x, y+1, TRUE);
       break;
   }
 
@@ -288,6 +474,7 @@ static void kill_player(struct PLAYER *ply)
     case Xbug_2_s:
     case Xbug_2_w:
       cave[x-1][y] = Xboom_bug;
+      Lboom_bug_new(x-1, y, TRUE);
       break;
 
     case Xtank_1_n:
@@ -298,7 +485,8 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_2_e:
     case Xtank_2_s:
     case Xtank_2_w:
-      cave[x-1][y] = Xboom_bomb;
+      cave[x-1][y] = Xboom_tank;
+      Lboom_tank_new(x-1, y, TRUE);
       break;
   }
 
@@ -319,7 +507,7 @@ static void kill_player(struct PLAYER *ply)
 
   switch (cave[x][y])
   {
-#ifdef USE_CHANGED_ACID_STUFF
+#ifdef ACID_PLAYER
     case Xacid_1:
     case Xacid_2:
     case Xacid_3:
@@ -353,7 +541,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
   if (dx && dy && ply->joy_snap)       /* more than one direction specified */
     return FALSE;
 
-  if (ply->joy_snap == 0)              /* player wants to move */
+  if (!ply->joy_snap)                  /* player wants to move */
   {
     int element = cave[x][y];
 
@@ -361,11 +549,12 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
     {
       /* fire is released */
       case Xblank:
-      case Xacid_splash_e:
-      case Xacid_splash_w:
+      case Xsplash_e:
+      case Xsplash_w:
        cave[x][y] = Zplayer;
        next[x][y] = Zplayer;
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+       // FALL THROUGH
+
       case Xfake_acid_1:
       case Xfake_acid_2:
       case Xfake_acid_3:
@@ -374,14 +563,12 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xfake_acid_6:
       case Xfake_acid_7:
       case Xfake_acid_8:
-#endif
        play_element_sound(x, y, SOUND_blank, Xblank);
        ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
-#ifdef USE_CHANGED_ACID_STUFF
       case Xacid_1:
       case Xacid_2:
       case Xacid_3:
@@ -390,13 +577,14 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xacid_6:
       case Xacid_7:
       case Xacid_8:
+#ifdef ACID_PLAYER
        if (cave[x+1][y-1] == Xblank)
-         cave[x+1][y-1] = Xacid_splash_e;
+         cave[x+1][y-1] = Xsplash_e;
        if (cave[x-1][y-1] == Xblank)
-         cave[x-1][y-1] = Xacid_splash_w;
+         cave[x-1][y-1] = Xsplash_w;
        play_element_sound(x, y, SOUND_acid, Xacid_1);
+       // FALL THROUGH
 #endif
-
       case Xboom_android:
       case Xboom_1:
       case Xbug_1_n:
@@ -415,17 +603,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xtank_2_e:
       case Xtank_2_s:
       case Xtank_2_w:
-
-#ifndef USE_CHANGED_ACID_STUFF
-      case Xacid_1:
-      case Xacid_2:
-      case Xacid_3:
-      case Xacid_4:
-      case Xacid_5:
-      case Xacid_6:
-      case Xacid_7:
-      case Xacid_8:
-#endif
        ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
@@ -457,7 +634,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        next[x][y] = Zplayer;
        play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.diamond_score;
-       lev.required = lev.required < 3 ? 0 : lev.required - 3;
+       lev.gems_needed = lev.gems_needed < 3 ? 0 : lev.gems_needed - 3;
        game.snapshot.collected_item = TRUE;
        ply->anim = PLY_walk_n + anim;
        ply->x = x;
@@ -470,7 +647,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        next[x][y] = Zplayer;
        play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.emerald_score;
-       lev.required = lev.required < 1 ? 0 : lev.required - 1;
+       lev.gems_needed = lev.gems_needed < 1 ? 0 : lev.gems_needed - 1;
        game.snapshot.collected_item = TRUE;
        ply->anim = PLY_walk_n + anim;
        ply->x = x;
@@ -567,8 +744,16 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        switch (cave[x+dx][y])
        {
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
+          case Xsplash_e:
+          case Xsplash_w:
+         case Xfake_acid_1:
+         case Xfake_acid_2:
+         case Xfake_acid_3:
+         case Xfake_acid_4:
+         case Xfake_acid_5:
+         case Xfake_acid_6:
+         case Xfake_acid_7:
+         case Xfake_acid_8:
            cave[x+dx][y] = dx > 0 ? Ystone_e : Ystone_w;
            next[x+dx][y] = Xstone_pause;
            goto stone_walk;
@@ -582,9 +767,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
            if (cave[x+dx+1][y-1] == Xblank)
-             cave[x+dx+1][y-1] = Xacid_splash_e;
+             cave[x+dx+1][y-1] = Xsplash_e;
            if (cave[x+dx-1][y-1] == Xblank)
-             cave[x+dx-1][y-1] = Xacid_splash_w;
+             cave[x+dx-1][y-1] = Xsplash_w;
            play_element_sound(x, y, SOUND_acid, Xacid_1);
 
           stone_walk:
@@ -606,8 +791,16 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        switch (cave[x+dx][y])
        {
          case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
+          case Xsplash_e:
+          case Xsplash_w:
+         case Xfake_acid_1:
+         case Xfake_acid_2:
+         case Xfake_acid_3:
+         case Xfake_acid_4:
+         case Xfake_acid_5:
+         case Xfake_acid_6:
+         case Xfake_acid_7:
+         case Xfake_acid_8:
            cave[x+dx][y] = dx > 0 ? Ybomb_e : Ybomb_w;
            next[x+dx][y] = Xbomb_pause;
            goto bomb_walk;
@@ -621,9 +814,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
            if (cave[x+dx+1][y-1] == Xblank)
-             cave[x+dx+1][y-1] = Xacid_splash_e;
+             cave[x+dx+1][y-1] = Xsplash_e;
            if (cave[x+dx-1][y-1] == Xblank)
-             cave[x+dx-1][y-1] = Xacid_splash_w;
+             cave[x+dx-1][y-1] = Xsplash_w;
            play_element_sound(x, y, SOUND_acid, Xacid_1);
 
           bomb_walk:
@@ -645,8 +838,16 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        switch (cave[x+dx][y])
        {
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
+          case Xsplash_e:
+          case Xsplash_w:
+         case Xfake_acid_1:
+         case Xfake_acid_2:
+         case Xfake_acid_3:
+         case Xfake_acid_4:
+         case Xfake_acid_5:
+         case Xfake_acid_6:
+         case Xfake_acid_7:
+         case Xfake_acid_8:
            cave[x+dx][y] = dx > 0 ? Ynut_e : Ynut_w;
            next[x+dx][y] = Xnut_pause;
            goto nut_walk;
@@ -660,9 +861,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
            if (cave[x+dx+1][y-1] == Xblank)
-             cave[x+dx+1][y-1] = Xacid_splash_e;
+             cave[x+dx+1][y-1] = Xsplash_e;
            if (cave[x+dx-1][y-1] == Xblank)
-             cave[x+dx-1][y-1] = Xacid_splash_w;
+             cave[x+dx-1][y-1] = Xsplash_w;
            play_element_sound(x, y, SOUND_acid, Xacid_1);
 
           nut_walk:
@@ -684,8 +885,16 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        switch (cave[x+dx][y])
        {
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
+          case Xsplash_e:
+          case Xsplash_w:
+         case Xfake_acid_1:
+         case Xfake_acid_2:
+         case Xfake_acid_3:
+         case Xfake_acid_4:
+         case Xfake_acid_5:
+         case Xfake_acid_6:
+         case Xfake_acid_7:
+         case Xfake_acid_8:
            cave[x+dx][y] = dx > 0 ? Yspring_e : Yspring_w;
            next[x+dx][y] = dx > 0 ? Xspring_e : Xspring_w;
            goto spring_walk;
@@ -699,9 +908,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
            if (cave[x+dx+1][y-1] == Xblank)
-             cave[x+dx+1][y-1] = Xacid_splash_e;
+             cave[x+dx+1][y-1] = Xsplash_e;
            if (cave[x+dx-1][y-1] == Xblank)
-             cave[x+dx-1][y-1] = Xacid_splash_w;
+             cave[x+dx-1][y-1] = Xsplash_w;
            play_element_sound(x, y, SOUND_acid, Xacid_1);
 
          spring_walk:
@@ -745,8 +954,16 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        switch (cave[x+dx][y+dy])
        {
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
+          case Xsplash_e:
+          case Xsplash_w:
+         case Xfake_acid_1:
+         case Xfake_acid_2:
+         case Xfake_acid_3:
+         case Xfake_acid_4:
+         case Xfake_acid_5:
+         case Xfake_acid_6:
+         case Xfake_acid_7:
+         case Xfake_acid_8:
            cave[x+dx][y+dy] = (dy ? (dy < 0 ? Yballoon_n : Yballoon_s) :
                                (dx > 0 ? Yballoon_e : Yballoon_w));
            next[x+dx][y+dy] = Xballoon;
@@ -761,9 +978,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
            if (cave[x+dx+1][y+dy-1] == Xblank)
-             cave[x+dx+1][y+dy-1] = Xacid_splash_e;
+             cave[x+dx+1][y+dy-1] = Xsplash_e;
            if (cave[x+dx-1][y+dy-1] == Xblank)
-             cave[x+dx-1][y+dy-1] = Xacid_splash_w;
+             cave[x+dx-1][y+dy-1] = Xsplash_w;
            play_element_sound(x, y, SOUND_acid, Xacid_1);
 
          balloon_walk:
@@ -792,8 +1009,16 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        switch (cave[x+dx][y+dy])
        {
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
+          case Xsplash_e:
+          case Xsplash_w:
+         case Xfake_acid_1:
+         case Xfake_acid_2:
+         case Xfake_acid_3:
+         case Xfake_acid_4:
+         case Xfake_acid_5:
+         case Xfake_acid_6:
+         case Xfake_acid_7:
+         case Xfake_acid_8:
            cave[x+dx][y+dy] = (dy ? (dy < 0 ? Yandroid_n : Yandroid_s) :
                                (dx > 0 ? Yandroid_e : Yandroid_w));
            next[x+dx][y+dy] = (dy ? (dy < 0 ? Xandroid_2_n : Xandroid_2_s) :
@@ -809,9 +1034,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
            if (cave[x+dx+1][y+dy-1] == Xblank)
-             cave[x+dx+1][y+dy-1] = Xacid_splash_e;
+             cave[x+dx+1][y+dy-1] = Xsplash_e;
            if (cave[x+dx-1][y+dy-1] == Xblank)
-             cave[x+dx-1][y+dy-1] = Xacid_splash_w;
+             cave[x+dx-1][y+dy-1] = Xsplash_w;
            play_element_sound(x, y, SOUND_acid, Xacid_1);
 
          android_walk:
@@ -886,11 +1111,15 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 
       door_walk:
 
-       if (!tab_blank[cave[x+dx][y+dy]])
+       if (!is_blank[cave[x+dx][y+dy]])
          break;
 
-       cave[x+dx][y+dy] = Zplayer;
-       next[x+dx][y+dy] = Zplayer;
+       if (!is_fake_acid[cave[x+dx][y+dy]])
+       {
+         cave[x+dx][y+dy] = Zplayer;
+         next[x+dx][y+dy] = Zplayer;
+       }
+
        play_element_sound(x, y, SOUND_door, element);
        ply->anim = PLY_walk_n + anim;
        ply->x = x + dx;
@@ -938,7 +1167,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xswitch:
        play_element_sound(x, y, SOUND_press, element);
        lev.ball_cnt = lev.ball_time;
-       lev.ball_state = !lev.ball_state;
+       lev.ball_active = !lev.ball_active;
        break;
 
       case Xplant:
@@ -996,7 +1225,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        next[x][y] = Xblank;
        play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.diamond_score;
-       lev.required = lev.required < 3 ? 0 : lev.required - 3;
+       lev.gems_needed = lev.gems_needed < 3 ? 0 : lev.gems_needed - 3;
        game.snapshot.collected_item = TRUE;
        ply->anim = PLY_walk_n + anim;
        break;
@@ -1007,7 +1236,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        next[x][y] = Xblank;
        play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.emerald_score;
-       lev.required = lev.required < 1 ? 0 : lev.required - 1;
+       lev.gems_needed = lev.gems_needed < 1 ? 0 : lev.gems_needed - 1;
        game.snapshot.collected_item = TRUE;
        ply->anim = PLY_walk_n + anim;
        break;
@@ -1092,6 +1321,11 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
     }
   }
 
+  /* check for wrap-around movement */
+  if (ply->x < lev.left ||
+      ply->x > lev.right - 1)
+    play_element_sound(oldx, oldy, SOUND_door, Xdoor_1);
+
   return result;
 }
 
@@ -1159,7 +1393,10 @@ static void check_player(struct PLAYER *ply)
 
     if (!can_move)
     {
-      ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
+      ply->joy_n = FALSE;
+      ply->joy_e = FALSE;
+      ply->joy_s = FALSE;
+      ply->joy_w = FALSE;
 
       return;
     }
@@ -1167,7 +1404,7 @@ static void check_player(struct PLAYER *ply)
 
   if (dx == 0 && dy == 0)
   {
-    ply->joy_stick = 0;
+    ply->joy_stick = FALSE;
 
     if (ply->joy_drop)
     {
@@ -1183,17 +1420,21 @@ static void check_player(struct PLAYER *ply)
       ply->dynamite_cnt = 0;
     }
 
-    RandomEM += 7;     /* be a bit more random if the player doesn't move */
+    /* be a bit more random if the player doesn't move */
+    game_em.random += 7;
 
     return;
   }
 
-  ply->joy_stick = 1;
-  ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
+  ply->joy_stick = TRUE;
+  ply->joy_n = FALSE;
+  ply->joy_e = FALSE;
+  ply->joy_s = FALSE;
+  ply->joy_w = FALSE;
+
   ply->dynamite_cnt = 0;       /* reset dynamite timer if we move */
-  ply->joy_spin = !ply->joy_spin;
 
-  if (ply->joy_snap == 0)              /* player wants to move */
+  if (!ply->joy_snap)          /* player wants to move */
   {
     boolean moved = FALSE;
 
@@ -1292,7 +1533,6 @@ static void Lacid_8(int x, int y)
   next[x][y] = Xacid_1;
 }
 
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
 static void Lfake_acid_1(int x, int y)
 {
   next[x][y] = Xfake_acid_2;
@@ -1332,7 +1572,6 @@ static void Lfake_acid_8(int x, int y)
 {
   next[x][y] = Xfake_acid_1;
 }
-#endif
 
 static void Landroid(int x, int y)
 {
@@ -1340,14 +1579,14 @@ static void Landroid(int x, int y)
 
   if (lev.android_clone_cnt == 0)
   {
-    if (cave[x-1][y-1] != Xblank &&
-       cave[x][y-1]   != Xblank &&
-       cave[x+1][y-1] != Xblank &&
-       cave[x-1][y]   != Xblank &&
-       cave[x+1][y]   != Xblank &&
-       cave[x-1][y+1] != Xblank &&
-       cave[x][y+1]   != Xblank &&
-       cave[x+1][y+1] != Xblank)
+    if (!is_android_blank[cave[x-1][y-1]] &&
+       !is_android_blank[cave[x][y-1]]   &&
+       !is_android_blank[cave[x+1][y-1]] &&
+       !is_android_blank[cave[x-1][y]]   &&
+       !is_android_blank[cave[x+1][y]]   &&
+       !is_android_blank[cave[x-1][y+1]] &&
+       !is_android_blank[cave[x][y+1]]   &&
+       !is_android_blank[cave[x+1][y+1]])
       goto android_move;
 
     switch (RANDOM(8))
@@ -1451,91 +1690,91 @@ static void Landroid(int x, int y)
       /* randomly find a direction to move */
 
       case 0: /* S,NE,W,NW,SE,E,SW,N */
-       if (cave[x][y+1] == Xblank)   goto android_s;
-       if (cave[x+1][y-1] == Xblank) goto android_ne;
-       if (cave[x-1][y] == Xblank)   goto android_w;
-       if (cave[x-1][y-1] == Xblank) goto android_nw;
-       if (cave[x+1][y+1] == Xblank) goto android_se;
-       if (cave[x+1][y] == Xblank)   goto android_e;
-       if (cave[x-1][y+1] == Xblank) goto android_sw;
-       if (cave[x][y-1] == Xblank)   goto android_n;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
        goto android_move;
 
       case 1: /* NW,SE,N,S,NE,SW,E,W */
-       if (cave[x-1][y-1] == Xblank) goto android_nw;
-       if (cave[x+1][y+1] == Xblank) goto android_se;
-       if (cave[x][y-1] == Xblank)   goto android_n;
-       if (cave[x][y+1] == Xblank)   goto android_s;
-       if (cave[x+1][y-1] == Xblank) goto android_ne;
-       if (cave[x-1][y+1] == Xblank) goto android_sw;
-       if (cave[x+1][y] == Xblank)   goto android_e;
-       if (cave[x-1][y] == Xblank)   goto android_w;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
        goto android_move;
 
       case 2: /* SW,E,S,W,N,NW,SE,NE */
-       if (cave[x-1][y+1] == Xblank) goto android_sw;
-       if (cave[x+1][y] == Xblank)   goto android_e;
-       if (cave[x][y+1] == Xblank)   goto android_s;
-       if (cave[x-1][y] == Xblank)   goto android_w;
-       if (cave[x][y-1] == Xblank)   goto android_n;
-       if (cave[x-1][y-1] == Xblank) goto android_nw;
-       if (cave[x+1][y+1] == Xblank) goto android_se;
-       if (cave[x+1][y-1] == Xblank) goto android_ne;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
        goto android_move;
 
       case 3: /* N,SE,NE,E,W,S,NW,SW */
-       if (cave[x][y-1] == Xblank)   goto android_n;
-       if (cave[x+1][y+1] == Xblank) goto android_se;
-       if (cave[x+1][y-1] == Xblank) goto android_ne;
-       if (cave[x+1][y] == Xblank)   goto android_e;
-       if (cave[x-1][y] == Xblank)   goto android_w;
-       if (cave[x][y+1] == Xblank)   goto android_s;
-       if (cave[x-1][y-1] == Xblank) goto android_nw;
-       if (cave[x-1][y+1] == Xblank) goto android_sw;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
        goto android_move;
 
       case 4: /* SE,NW,E,NE,SW,W,N,S */
-       if (cave[x+1][y+1] == Xblank) goto android_se;
-       if (cave[x-1][y-1] == Xblank) goto android_nw;
-       if (cave[x+1][y] == Xblank)   goto android_e;
-       if (cave[x+1][y-1] == Xblank) goto android_ne;
-       if (cave[x-1][y+1] == Xblank) goto android_sw;
-       if (cave[x-1][y] == Xblank)   goto android_w;
-       if (cave[x][y-1] == Xblank)   goto android_n;
-       if (cave[x][y+1] == Xblank)   goto android_s;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
        goto android_move;
 
       case 5: /* NE,W,SE,SW,S,N,E,NW */
-       if (cave[x+1][y-1] == Xblank) goto android_ne;
-       if (cave[x-1][y] == Xblank)   goto android_w;
-       if (cave[x+1][y+1] == Xblank) goto android_se;
-       if (cave[x-1][y+1] == Xblank) goto android_sw;
-       if (cave[x][y+1] == Xblank)   goto android_s;
-       if (cave[x][y-1] == Xblank)   goto android_n;
-       if (cave[x+1][y] == Xblank)   goto android_e;
-       if (cave[x-1][y-1] == Xblank) goto android_nw;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
        goto android_move;
 
       case 6: /* E,N,SW,S,NW,NE,SE,W */
-       if (cave[x+1][y] == Xblank)   goto android_e;
-       if (cave[x][y-1] == Xblank)   goto android_n;
-       if (cave[x-1][y+1] == Xblank) goto android_sw;
-       if (cave[x][y+1] == Xblank)   goto android_s;
-       if (cave[x-1][y-1] == Xblank) goto android_nw;
-       if (cave[x+1][y-1] == Xblank) goto android_ne;
-       if (cave[x+1][y+1] == Xblank) goto android_se;
-       if (cave[x-1][y] == Xblank)   goto android_w;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
        goto android_move;
 
       case 7: /* W,SW,NW,N,E,SE,NE,S */
-       if (cave[x-1][y] == Xblank)   goto android_w;
-       if (cave[x-1][y+1] == Xblank) goto android_sw;
-       if (cave[x-1][y-1] == Xblank) goto android_nw;
-       if (cave[x][y-1] == Xblank)   goto android_n;
-       if (cave[x+1][y] == Xblank)   goto android_e;
-       if (cave[x+1][y+1] == Xblank) goto android_se;
-       if (cave[x+1][y-1] == Xblank) goto android_ne;
-       if (cave[x][y+1] == Xblank)   goto android_s;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
        goto android_move;
     }
   }
@@ -1565,54 +1804,54 @@ static void Landroid(int x, int y)
        /* attempt clockwise move first if direct path is blocked */
 
        case 0: /* north west */
-         if (tab_android_move[cave[x-1][y-1]]) goto android_nw;
-         if (tab_android_move[cave[x][y-1]])   goto android_n;
-         if (tab_android_move[cave[x-1][y]])   goto android_w;
+         if (is_android_walkable[cave[x-1][y-1]]) goto android_nw;
+         if (is_android_walkable[cave[x][y-1]])   goto android_n;
+         if (is_android_walkable[cave[x-1][y]])   goto android_w;
          break;
 
        case 1: /* north */
-         if (tab_android_move[cave[x][y-1]])   goto android_n;
-         if (tab_android_move[cave[x+1][y-1]]) goto android_ne;
-         if (tab_android_move[cave[x-1][y-1]]) goto android_nw;
+         if (is_android_walkable[cave[x][y-1]])   goto android_n;
+         if (is_android_walkable[cave[x+1][y-1]]) goto android_ne;
+         if (is_android_walkable[cave[x-1][y-1]]) goto android_nw;
          break;
 
        case 2: /* north east */
-         if (tab_android_move[cave[x+1][y-1]]) goto android_ne;
-         if (tab_android_move[cave[x+1][y]])   goto android_e;
-         if (tab_android_move[cave[x][y-1]])   goto android_n;
+         if (is_android_walkable[cave[x+1][y-1]]) goto android_ne;
+         if (is_android_walkable[cave[x+1][y]])   goto android_e;
+         if (is_android_walkable[cave[x][y-1]])   goto android_n;
          break;
 
        case 3: /* west */
-         if (tab_android_move[cave[x-1][y]])   goto android_w;
-         if (tab_android_move[cave[x-1][y-1]]) goto android_nw;
-         if (tab_android_move[cave[x-1][y+1]]) goto android_sw;
+         if (is_android_walkable[cave[x-1][y]])   goto android_w;
+         if (is_android_walkable[cave[x-1][y-1]]) goto android_nw;
+         if (is_android_walkable[cave[x-1][y+1]]) goto android_sw;
          break;
 
        case 4: /* nowhere */
          break;
 
        case 5: /* east */
-         if (tab_android_move[cave[x+1][y]])   goto android_e;
-         if (tab_android_move[cave[x+1][y+1]]) goto android_se;
-         if (tab_android_move[cave[x+1][y-1]]) goto android_ne;
+         if (is_android_walkable[cave[x+1][y]])   goto android_e;
+         if (is_android_walkable[cave[x+1][y+1]]) goto android_se;
+         if (is_android_walkable[cave[x+1][y-1]]) goto android_ne;
          break;
 
        case 6: /* south west */
-         if (tab_android_move[cave[x-1][y+1]]) goto android_sw;
-         if (tab_android_move[cave[x-1][y]])   goto android_w;
-         if (tab_android_move[cave[x][y+1]])   goto android_s;
+         if (is_android_walkable[cave[x-1][y+1]]) goto android_sw;
+         if (is_android_walkable[cave[x-1][y]])   goto android_w;
+         if (is_android_walkable[cave[x][y+1]])   goto android_s;
          break;
 
        case 7: /* south */
-         if (tab_android_move[cave[x][y+1]])   goto android_s;
-         if (tab_android_move[cave[x-1][y+1]]) goto android_sw;
-         if (tab_android_move[cave[x+1][y+1]]) goto android_se;
+         if (is_android_walkable[cave[x][y+1]])   goto android_s;
+         if (is_android_walkable[cave[x-1][y+1]]) goto android_sw;
+         if (is_android_walkable[cave[x+1][y+1]]) goto android_se;
          break;
 
        case 8: /* south east */
-         if (tab_android_move[cave[x+1][y+1]]) goto android_se;
-         if (tab_android_move[cave[x][y+1]])   goto android_s;
-         if (tab_android_move[cave[x+1][y]])   goto android_e;
+         if (is_android_walkable[cave[x+1][y+1]]) goto android_se;
+         if (is_android_walkable[cave[x][y+1]])   goto android_s;
+         if (is_android_walkable[cave[x+1][y]])   goto android_e;
          break;
       }
     }
@@ -1623,54 +1862,54 @@ static void Landroid(int x, int y)
        /* attempt counterclockwise move first if direct path is blocked */
 
        case 0: /* north west */
-         if (tab_android_move[cave[x-1][y-1]]) goto android_nw;
-         if (tab_android_move[cave[x-1][y]])   goto android_w;
-         if (tab_android_move[cave[x][y-1]])   goto android_n;
+         if (is_android_walkable[cave[x-1][y-1]]) goto android_nw;
+         if (is_android_walkable[cave[x-1][y]])   goto android_w;
+         if (is_android_walkable[cave[x][y-1]])   goto android_n;
          break;
 
        case 1: /* north */
-         if (tab_android_move[cave[x][y-1]])   goto android_n;
-         if (tab_android_move[cave[x-1][y-1]]) goto android_nw;
-         if (tab_android_move[cave[x+1][y-1]]) goto android_ne;
+         if (is_android_walkable[cave[x][y-1]])   goto android_n;
+         if (is_android_walkable[cave[x-1][y-1]]) goto android_nw;
+         if (is_android_walkable[cave[x+1][y-1]]) goto android_ne;
          break;
 
        case 2: /* north east */
-         if (tab_android_move[cave[x+1][y-1]]) goto android_ne;
-         if (tab_android_move[cave[x][y-1]])   goto android_n;
-         if (tab_android_move[cave[x+1][y]])   goto android_e;
+         if (is_android_walkable[cave[x+1][y-1]]) goto android_ne;
+         if (is_android_walkable[cave[x][y-1]])   goto android_n;
+         if (is_android_walkable[cave[x+1][y]])   goto android_e;
          break;
 
        case 3: /* west */
-         if (tab_android_move[cave[x-1][y]])   goto android_w;
-         if (tab_android_move[cave[x-1][y+1]]) goto android_sw;
-         if (tab_android_move[cave[x-1][y-1]]) goto android_nw;
+         if (is_android_walkable[cave[x-1][y]])   goto android_w;
+         if (is_android_walkable[cave[x-1][y+1]]) goto android_sw;
+         if (is_android_walkable[cave[x-1][y-1]]) goto android_nw;
          break;
 
        case 4: /* nowhere */
          break;
 
        case 5: /* east */
-         if (tab_android_move[cave[x+1][y]])   goto android_e;
-         if (tab_android_move[cave[x+1][y-1]]) goto android_ne;
-         if (tab_android_move[cave[x+1][y+1]]) goto android_se;
+         if (is_android_walkable[cave[x+1][y]])   goto android_e;
+         if (is_android_walkable[cave[x+1][y-1]]) goto android_ne;
+         if (is_android_walkable[cave[x+1][y+1]]) goto android_se;
          break;
 
        case 6: /* south west */
-         if (tab_android_move[cave[x-1][y+1]]) goto android_sw;
-         if (tab_android_move[cave[x][y+1]])   goto android_s;
-         if (tab_android_move[cave[x-1][y]])   goto android_w;
+         if (is_android_walkable[cave[x-1][y+1]]) goto android_sw;
+         if (is_android_walkable[cave[x][y+1]])   goto android_s;
+         if (is_android_walkable[cave[x-1][y]])   goto android_w;
          break;
 
        case 7: /* south */
-         if (tab_android_move[cave[x][y+1]])   goto android_s;
-         if (tab_android_move[cave[x+1][y+1]]) goto android_se;
-         if (tab_android_move[cave[x-1][y+1]]) goto android_sw;
+         if (is_android_walkable[cave[x][y+1]])   goto android_s;
+         if (is_android_walkable[cave[x+1][y+1]]) goto android_se;
+         if (is_android_walkable[cave[x-1][y+1]]) goto android_sw;
          break;
 
        case 8: /* south east */
-         if (tab_android_move[cave[x+1][y+1]]) goto android_se;
-         if (tab_android_move[cave[x+1][y]])   goto android_e;
-         if (tab_android_move[cave[x][y+1]])   goto android_s;
+         if (is_android_walkable[cave[x+1][y+1]]) goto android_se;
+         if (is_android_walkable[cave[x+1][y]])   goto android_e;
+         if (is_android_walkable[cave[x][y+1]])   goto android_s;
          break;
       }
     }
@@ -1742,8 +1981,16 @@ static void Landroid_1_n(int x, int y)
   switch (cave[x][y-1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yandroid_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Yandroid_n;
@@ -1762,9 +2009,9 @@ static void Landroid_1_n(int x, int y)
       cave[x][y] = Yandroid_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-       cave[x+1][y-2] = Xacid_splash_e;
+       cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-       cave[x-1][y-2] = Xacid_splash_w;
+       cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1779,8 +2026,16 @@ static void Landroid_2_n(int x, int y)
   switch (cave[x][y-1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yandroid_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Yandroid_n;
@@ -1799,9 +2054,9 @@ static void Landroid_2_n(int x, int y)
       cave[x][y] = Yandroid_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-       cave[x+1][y-2] = Xacid_splash_e;
+       cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-       cave[x-1][y-2] = Xacid_splash_w;
+       cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1816,8 +2071,16 @@ static void Landroid_1_e(int x, int y)
   switch (cave[x+1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yandroid_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Yandroid_e;
@@ -1836,9 +2099,9 @@ static void Landroid_1_e(int x, int y)
       cave[x][y] = Yandroid_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-       cave[x+2][y-1] = Xacid_splash_e;
+       cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_w;
+       cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1853,8 +2116,16 @@ static void Landroid_2_e(int x, int y)
   switch (cave[x+1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yandroid_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Yandroid_e;
@@ -1873,9 +2144,9 @@ static void Landroid_2_e(int x, int y)
       cave[x][y] = Yandroid_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-       cave[x+2][y-1] = Xacid_splash_e;
+       cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_w;
+       cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1890,8 +2161,16 @@ static void Landroid_1_s(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yandroid_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yandroid_s;
@@ -1910,9 +2189,9 @@ static void Landroid_1_s(int x, int y)
       cave[x][y] = Yandroid_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1927,8 +2206,16 @@ static void Landroid_2_s(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yandroid_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yandroid_s;
@@ -1947,9 +2234,9 @@ static void Landroid_2_s(int x, int y)
       cave[x][y] = Yandroid_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1964,8 +2251,16 @@ static void Landroid_1_w(int x, int y)
   switch (cave[x-1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yandroid_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Yandroid_w;
@@ -1984,9 +2279,9 @@ static void Landroid_1_w(int x, int y)
       cave[x][y] = Yandroid_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_e;
+       cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-       cave[x-2][y-1] = Xacid_splash_w;
+       cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2001,8 +2296,16 @@ static void Landroid_2_w(int x, int y)
   switch (cave[x-1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yandroid_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Yandroid_w;
@@ -2021,9 +2324,9 @@ static void Landroid_2_w(int x, int y)
       cave[x][y] = Yandroid_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_e;
+       cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-       cave[x-2][y-1] = Xacid_splash_w;
+       cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2069,12 +2372,20 @@ static void Leater_n(int x, int y)
 
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Yeater_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Yeater_n;
@@ -2092,9 +2403,9 @@ static void Leater_n(int x, int y)
       cave[x][y] = Yeater_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-       cave[x+1][y-2] = Xacid_splash_e;
+       cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-       cave[x-1][y-2] = Xacid_splash_w;
+       cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2141,12 +2452,20 @@ static void Leater_e(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Yeater_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Yeater_e;
@@ -2164,9 +2483,9 @@ static void Leater_e(int x, int y)
       cave[x][y] = Yeater_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-       cave[x+2][y-1] = Xacid_splash_e;
+       cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_w;
+       cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2213,12 +2532,20 @@ static void Leater_s(int x, int y)
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Yeater_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yeater_s;
@@ -2236,9 +2563,9 @@ static void Leater_s(int x, int y)
       cave[x][y] = Yeater_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2285,12 +2612,20 @@ static void Leater_w(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Yeater_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Yeater_w;
@@ -2308,9 +2643,9 @@ static void Leater_w(int x, int y)
       cave[x][y] = Yeater_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_e;
+       cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-       cave[x-2][y-1] = Xacid_splash_w;
+       cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2341,12 +2676,20 @@ static void Lalien(int x, int y)
     {
       switch (cave[x][y-1])
       {
+       case Zplayer:
        case Xblank:
-       case Xacid_splash_e:
-       case Xacid_splash_w:
+       case Xsplash_e:
+       case Xsplash_w:
+       case Xfake_acid_1:
+       case Xfake_acid_2:
+       case Xfake_acid_3:
+       case Xfake_acid_4:
+       case Xfake_acid_5:
+       case Xfake_acid_6:
+       case Xfake_acid_7:
+       case Xfake_acid_8:
        case Xplant:
        case Yplant:
-       case Zplayer:
          cave[x][y] = Yalien_nB;
          next[x][y] = Xblank;
          cave[x][y-1] = Yalien_n;
@@ -2365,9 +2708,9 @@ static void Lalien(int x, int y)
          cave[x][y] = Yalien_nB;
          next[x][y] = Xblank;
          if (cave[x+1][y-2] == Xblank)
-           cave[x+1][y-2] = Xacid_splash_e;
+           cave[x+1][y-2] = Xsplash_e;
          if (cave[x-1][y-2] == Xblank)
-           cave[x-1][y-2] = Xacid_splash_w;
+           cave[x-1][y-2] = Xsplash_w;
          play_element_sound(x, y, SOUND_acid, Xacid_1);
          return;
       }
@@ -2376,12 +2719,20 @@ static void Lalien(int x, int y)
     {
       switch (cave[x][y+1])
       {
+       case Zplayer:
        case Xblank:
-       case Xacid_splash_e:
-       case Xacid_splash_w:
+       case Xsplash_e:
+       case Xsplash_w:
+       case Xfake_acid_1:
+       case Xfake_acid_2:
+       case Xfake_acid_3:
+       case Xfake_acid_4:
+       case Xfake_acid_5:
+       case Xfake_acid_6:
+       case Xfake_acid_7:
+       case Xfake_acid_8:
        case Xplant:
        case Yplant:
-       case Zplayer:
          cave[x][y] = Yalien_sB;
          next[x][y] = Xblank;
          cave[x][y+1] = Yalien_s;
@@ -2400,9 +2751,9 @@ static void Lalien(int x, int y)
          cave[x][y] = Yalien_sB;
          next[x][y] = Xblank;
          if (cave[x+1][y] == Xblank)
-           cave[x+1][y] = Xacid_splash_e;
+           cave[x+1][y] = Xsplash_e;
          if (cave[x-1][y] == Xblank)
-           cave[x-1][y] = Xacid_splash_w;
+           cave[x-1][y] = Xsplash_w;
          play_element_sound(x, y, SOUND_acid, Xacid_1);
          return;
       }
@@ -2414,12 +2765,20 @@ static void Lalien(int x, int y)
     {
       switch (cave[x+1][y])
       {
+       case Zplayer:
        case Xblank:
-       case Xacid_splash_e:
-       case Xacid_splash_w:
+       case Xsplash_e:
+       case Xsplash_w:
+       case Xfake_acid_1:
+       case Xfake_acid_2:
+       case Xfake_acid_3:
+       case Xfake_acid_4:
+       case Xfake_acid_5:
+       case Xfake_acid_6:
+       case Xfake_acid_7:
+       case Xfake_acid_8:
        case Xplant:
        case Yplant:
-       case Zplayer:
          cave[x][y] = Yalien_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Yalien_e;
@@ -2438,9 +2797,9 @@ static void Lalien(int x, int y)
          cave[x][y] = Yalien_eB;
          next[x][y] = Xblank;
          if (cave[x+2][y-1] == Xblank)
-           cave[x+2][y-1] = Xacid_splash_e;
+           cave[x+2][y-1] = Xsplash_e;
          if (cave[x][y-1] == Xblank)
-           cave[x][y-1] = Xacid_splash_w;
+           cave[x][y-1] = Xsplash_w;
          play_element_sound(x, y, SOUND_acid, Xacid_1);
          return;
       }
@@ -2449,12 +2808,20 @@ static void Lalien(int x, int y)
     {
       switch (cave[x-1][y])
       {
+       case Zplayer:
        case Xblank:
-       case Xacid_splash_e:
-       case Xacid_splash_w:
+       case Xsplash_e:
+       case Xsplash_w:
+       case Xfake_acid_1:
+       case Xfake_acid_2:
+       case Xfake_acid_3:
+       case Xfake_acid_4:
+       case Xfake_acid_5:
+       case Xfake_acid_6:
+       case Xfake_acid_7:
+       case Xfake_acid_8:
        case Xplant:
        case Yplant:
-       case Zplayer:
          cave[x][y] = Yalien_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Yalien_w;
@@ -2473,9 +2840,9 @@ static void Lalien(int x, int y)
          cave[x][y] = Yalien_wB;
          next[x][y] = Xblank;
          if (cave[x][y-1] == Xblank)
-           cave[x][y-1] = Xacid_splash_e;
+           cave[x][y-1] = Xsplash_e;
          if (cave[x-2][y-1] == Xblank)
-           cave[x-2][y-1] = Xacid_splash_w;
+           cave[x-2][y-1] = Xsplash_w;
          play_element_sound(x, y, SOUND_acid, Xacid_1);
          return;
       }
@@ -2492,12 +2859,20 @@ static void Lbug_n(int x, int y)
 {
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ybug_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Ybug_n;
@@ -2516,9 +2891,9 @@ static void Lbug_n(int x, int y)
       cave[x][y] = Ybug_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-       cave[x+1][y-2] = Xacid_splash_e;
+       cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-       cave[x-1][y-2] = Xacid_splash_w;
+       cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2532,21 +2907,31 @@ static void Lbug_n(int x, int y)
 
 static void Lbug_1_n(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_bug(x, y, Xbug_1_n);
+    next[x][y] = Zboom;
+    Lboom_bug(x, y);
 
     return;
   }
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -2557,7 +2942,6 @@ static void Lbug_1_n(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
-    case Zplayer:
       cave[x][y] = Ybug_n_e;
       next[x][y] = Xbug_2_e;
       play_element_sound(x, y, SOUND_bug, Xbug_1_n);
@@ -2571,12 +2955,13 @@ static void Lbug_1_n(int x, int y)
 
 static void Lbug_2_n(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_bug(x, y, Xbug_2_n);
+    next[x][y] = Zboom;
+    Lboom_bug(x, y);
 
     return;
   }
@@ -2588,12 +2973,20 @@ static void Lbug_e(int x, int y)
 {
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ybug_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Ybug_e;
@@ -2612,9 +3005,9 @@ static void Lbug_e(int x, int y)
       cave[x][y] = Ybug_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-       cave[x+2][y-1] = Xacid_splash_e;
+       cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_w;
+       cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2628,21 +3021,31 @@ static void Lbug_e(int x, int y)
 
 static void Lbug_1_e(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_bug(x, y, Xbug_1_e);
+    next[x][y] = Zboom;
+    Lboom_bug(x, y);
 
     return;
   }
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -2653,7 +3056,6 @@ static void Lbug_1_e(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
-    case Zplayer:
       cave[x][y] = Ybug_e_s;
       next[x][y] = Xbug_2_s;
       play_element_sound(x, y, SOUND_bug, Xbug_1_e);
@@ -2667,12 +3069,13 @@ static void Lbug_1_e(int x, int y)
 
 static void Lbug_2_e(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_bug(x, y, Xbug_2_e);
+    next[x][y] = Zboom;
+    Lboom_bug(x, y);
 
     return;
   }
@@ -2684,12 +3087,20 @@ static void Lbug_s(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ybug_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ybug_s;
@@ -2708,9 +3119,9 @@ static void Lbug_s(int x, int y)
       cave[x][y] = Ybug_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2724,21 +3135,31 @@ static void Lbug_s(int x, int y)
 
 static void Lbug_1_s(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_bug(x, y, Xbug_1_s);
+    next[x][y] = Zboom;
+    Lboom_bug(x, y);
 
     return;
   }
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -2749,7 +3170,6 @@ static void Lbug_1_s(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
-    case Zplayer:
       cave[x][y] = Ybug_s_w;
       next[x][y] = Xbug_2_w;
       play_element_sound(x, y, SOUND_bug, Xbug_1_s);
@@ -2763,12 +3183,13 @@ static void Lbug_1_s(int x, int y)
 
 static void Lbug_2_s(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_bug(x, y, Xbug_2_s);
+    next[x][y] = Zboom;
+    Lboom_bug(x, y);
 
     return;
   }
@@ -2780,13 +3201,21 @@ static void Lbug_w(int x, int y)
 {
   switch (cave[x-1][y])
   {
-    case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-    case Xplant:
-    case Yplant:
     case Zplayer:
-      cave[x][y] = Ybug_wB;
+    case Xblank:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
+    case Xplant:
+    case Yplant:
+      cave[x][y] = Ybug_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Ybug_w;
       next[x-1][y] = Xbug_1_w;
@@ -2804,9 +3233,9 @@ static void Lbug_w(int x, int y)
       cave[x][y] = Ybug_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_e;
+       cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-       cave[x-2][y-1] = Xacid_splash_w;
+       cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2820,21 +3249,31 @@ static void Lbug_w(int x, int y)
 
 static void Lbug_1_w(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_bug(x, y, Xbug_1_w);
+    next[x][y] = Zboom;
+    Lboom_bug(x, y);
 
     return;
   }
 
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -2845,7 +3284,6 @@ static void Lbug_1_w(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
-    case Zplayer:
       cave[x][y] = Ybug_w_n;
       next[x][y] = Xbug_2_n;
       play_element_sound(x, y, SOUND_bug, Xbug_1_w);
@@ -2859,12 +3297,13 @@ static void Lbug_1_w(int x, int y)
 
 static void Lbug_2_w(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_bug(x, y, Xbug_2_w);
+    next[x][y] = Zboom;
+    Lboom_bug(x, y);
 
     return;
   }
@@ -2876,12 +3315,20 @@ static void Ltank_n(int x, int y)
 {
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ytank_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Ytank_n;
@@ -2900,9 +3347,9 @@ static void Ltank_n(int x, int y)
       cave[x][y] = Ytank_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-       cave[x+1][y-2] = Xacid_splash_e;
+       cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-       cave[x-1][y-2] = Xacid_splash_w;
+       cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2916,21 +3363,31 @@ static void Ltank_n(int x, int y)
 
 static void Ltank_1_n(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_tank(x, y, Xtank_1_n);
+    next[x][y] = Zboom;
+    Lboom_tank(x, y);
 
     return;
   }
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -2941,7 +3398,6 @@ static void Ltank_1_n(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
-    case Zplayer:
       cave[x][y] = Ytank_n_w;
       next[x][y] = Xtank_2_w;
       play_element_sound(x, y, SOUND_tank, Xtank_1_n);
@@ -2955,12 +3411,13 @@ static void Ltank_1_n(int x, int y)
 
 static void Ltank_2_n(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_tank(x, y, Xtank_2_n);
+    next[x][y] = Zboom;
+    Lboom_tank(x, y);
 
     return;
   }
@@ -2972,12 +3429,20 @@ static void Ltank_e(int x, int y)
 {
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ytank_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Ytank_e;
@@ -2996,9 +3461,9 @@ static void Ltank_e(int x, int y)
       cave[x][y] = Ytank_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-       cave[x+2][y-1] = Xacid_splash_e;
+       cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_w;
+       cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3012,21 +3477,31 @@ static void Ltank_e(int x, int y)
 
 static void Ltank_1_e(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_tank(x, y, Xtank_1_e);
+    next[x][y] = Zboom;
+    Lboom_tank(x, y);
 
     return;
   }
 
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3037,7 +3512,6 @@ static void Ltank_1_e(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
-    case Zplayer:
       cave[x][y] = Ytank_e_n;
       next[x][y] = Xtank_2_n;
       play_element_sound(x, y, SOUND_tank, Xtank_1_e);
@@ -3051,12 +3525,13 @@ static void Ltank_1_e(int x, int y)
 
 static void Ltank_2_e(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_tank(x, y, Xtank_2_e);
+    next[x][y] = Zboom;
+    Lboom_tank(x, y);
 
     return;
   }
@@ -3068,12 +3543,20 @@ static void Ltank_s(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ytank_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ytank_s;
@@ -3092,9 +3575,9 @@ static void Ltank_s(int x, int y)
       cave[x][y] = Ytank_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3108,21 +3591,31 @@ static void Ltank_s(int x, int y)
 
 static void Ltank_1_s(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_tank(x, y, Xtank_1_s);
+    next[x][y] = Zboom;
+    Lboom_tank(x, y);
 
     return;
   }
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3133,7 +3626,6 @@ static void Ltank_1_s(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
-    case Zplayer:
       cave[x][y] = Ytank_s_e;
       next[x][y] = Xtank_2_e;
       play_element_sound(x, y, SOUND_tank, Xtank_1_s);
@@ -3147,12 +3639,13 @@ static void Ltank_1_s(int x, int y)
 
 static void Ltank_2_s(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_tank(x, y, Xtank_2_s);
+    next[x][y] = Zboom;
+    Lboom_tank(x, y);
 
     return;
   }
@@ -3164,12 +3657,20 @@ static void Ltank_w(int x, int y)
 {
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ytank_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Ytank_w;
@@ -3188,9 +3689,9 @@ static void Ltank_w(int x, int y)
       cave[x][y] = Ytank_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_e;
+       cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-       cave[x-2][y-1] = Xacid_splash_w;
+       cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3204,21 +3705,31 @@ static void Ltank_w(int x, int y)
 
 static void Ltank_1_w(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_tank(x, y, Xtank_1_w);
+    next[x][y] = Zboom;
+    Lboom_tank(x, y);
 
     return;
   }
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3229,7 +3740,6 @@ static void Ltank_1_w(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
-    case Zplayer:
       cave[x][y] = Ytank_w_s;
       next[x][y] = Xtank_2_s;
       play_element_sound(x, y, SOUND_tank, Xtank_1_w);
@@ -3243,12 +3753,13 @@ static void Ltank_1_w(int x, int y)
 
 static void Ltank_2_w(int x, int y)
 {
-  if (tab_amoeba[cave[x][y-1]] ||
-      tab_amoeba[cave[x+1][y]] ||
-      tab_amoeba[cave[x][y+1]] ||
-      tab_amoeba[cave[x-1][y]])
+  if (is_amoeba[cave[x][y-1]] ||
+      is_amoeba[cave[x+1][y]] ||
+      is_amoeba[cave[x][y+1]] ||
+      is_amoeba[cave[x-1][y]])
   {
-    Lboom_tank(x, y, Xtank_2_w);
+    next[x][y] = Zboom;
+    Lboom_tank(x, y);
 
     return;
   }
@@ -3261,8 +3772,16 @@ static void Lemerald(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yemerald_s;
@@ -3280,16 +3799,12 @@ static void Lemerald(int x, int y)
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -3299,24 +3814,20 @@ static void Lemerald(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
-    case Xwonderwall:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -3325,12 +3836,17 @@ static void Lemerald(int x, int y)
     case Xkey_6:
     case Xkey_7:
     case Xkey_8:
-    case Xbumper:
+    case Xballoon:
+    case Xball_1:
+    case Xball_2:
+    case Xwonderwall:
     case Xswitch:
-    case Xsteel_1:
-    case Xsteel_2:
-    case Xsteel_3:
-    case Xsteel_4:
+    case Xbumper:
+    case Ybumper:
+    case Xacid_ne:
+    case Xacid_nw:
+    case Xslide_ns:
+    case Xslide_ew:
     case Xwall_1:
     case Xwall_2:
     case Xwall_3:
@@ -3339,43 +3855,55 @@ static void Lemerald(int x, int y)
     case Xroundwall_2:
     case Xroundwall_3:
     case Xroundwall_4:
+    case Xsteel_1:
+    case Xsteel_2:
+    case Xsteel_3:
+    case Xsteel_4:
       if (RANDOM(2))
       {
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Yemerald_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Yemerald_e;
          next[x+1][y] = Xemerald_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Yemerald_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Yemerald_w;
          next[x-1][y] = Xemerald_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
       else
       {
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Yemerald_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Yemerald_w;
          next[x-1][y] = Xemerald_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Yemerald_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Yemerald_e;
          next[x+1][y] = Xemerald_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
@@ -3396,8 +3924,16 @@ static void Lemerald_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yemerald_s;
@@ -3415,9 +3951,9 @@ static void Lemerald_pause(int x, int y)
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3432,10 +3968,18 @@ static void Lemerald_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
-    case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
     case Zplayer:
+    case Xblank:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yemerald_s;
@@ -3453,24 +3997,23 @@ static void Lemerald_fall(int x, int y)
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
     case Xwonderwall:
-      if (lev.wonderwall_time)
+      if (lev.wonderwall_time > 0)
       {
-       lev.wonderwall_state = 1;
+       lev.wonderwall_active = TRUE;
        cave[x][y] = Yemerald_sB;
-       if (tab_blank[cave[x][y+2]])
+       next[x][y] = Xblank;
+       if (is_blank[cave[x][y+2]])
        {
          cave[x][y+2] = Ydiamond_s;
          next[x][y+2] = Xdiamond_fall;
        }
-
-       next[x][y] = Xblank;
        play_element_sound(x, y, SOUND_wonderfall, Xwonderwall);
        return;
       }
@@ -3488,8 +4031,16 @@ static void Ldiamond(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ydiamond_s;
@@ -3507,16 +4058,12 @@ static void Ldiamond(int x, int y)
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -3526,24 +4073,20 @@ static void Ldiamond(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
-    case Xwonderwall:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -3552,12 +4095,17 @@ static void Ldiamond(int x, int y)
     case Xkey_6:
     case Xkey_7:
     case Xkey_8:
-    case Xbumper:
+    case Xballoon:
+    case Xball_1:
+    case Xball_2:
+    case Xwonderwall:
     case Xswitch:
-    case Xsteel_1:
-    case Xsteel_2:
-    case Xsteel_3:
-    case Xsteel_4:
+    case Xbumper:
+    case Ybumper:
+    case Xacid_ne:
+    case Xacid_nw:
+    case Xslide_ns:
+    case Xslide_ew:
     case Xwall_1:
     case Xwall_2:
     case Xwall_3:
@@ -3566,43 +4114,55 @@ static void Ldiamond(int x, int y)
     case Xroundwall_2:
     case Xroundwall_3:
     case Xroundwall_4:
+    case Xsteel_1:
+    case Xsteel_2:
+    case Xsteel_3:
+    case Xsteel_4:
       if (RANDOM(2))
       {
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Ydiamond_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Ydiamond_e;
          next[x+1][y] = Xdiamond_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Ydiamond_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Ydiamond_w;
          next[x-1][y] = Xdiamond_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
       else
       {
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Ydiamond_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Ydiamond_w;
          next[x-1][y] = Xdiamond_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Ydiamond_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Ydiamond_e;
          next[x+1][y] = Xdiamond_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
@@ -3623,8 +4183,16 @@ static void Ldiamond_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ydiamond_s;
@@ -3642,9 +4210,9 @@ static void Ldiamond_pause(int x, int y)
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3659,10 +4227,18 @@ static void Ldiamond_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
-    case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
     case Zplayer:
+    case Xblank:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ydiamond_s;
@@ -3680,24 +4256,23 @@ static void Ldiamond_fall(int x, int y)
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
     case Xwonderwall:
-      if (lev.wonderwall_time)
+      if (lev.wonderwall_time > 0)
       {
-       lev.wonderwall_state = 1;
+       lev.wonderwall_active = TRUE;
        cave[x][y] = Ydiamond_sB;
-       if (tab_blank[cave[x][y+2]])
+       next[x][y] = Xblank;
+       if (is_blank[cave[x][y+2]])
        {
          cave[x][y+2] = Ystone_s;
          next[x][y+2] = Xstone_fall;
        }
-
-       next[x][y] = Xblank;
        play_element_sound(x, y, SOUND_wonderfall, Xwonderwall);
        return;
       }
@@ -3715,11 +4290,8 @@ static void Lstone(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-    case Xplant:
-    case Yplant:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3728,7 +4300,8 @@ static void Lstone(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
+    case Xplant:
+    case Yplant:
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ystone_s;
@@ -3746,9 +4319,9 @@ static void Lstone(int x, int y)
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3759,10 +4332,6 @@ static void Lstone(int x, int y)
       next[x][y+1] = Xsand_sandstone_2;
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -3772,76 +4341,89 @@ static void Lstone(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
-    case Xkey_1:
-    case Xkey_2:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
+    case Xkey_1:
+    case Xkey_2:
     case Xkey_3:
     case Xkey_4:
     case Xkey_5:
     case Xkey_6:
     case Xkey_7:
     case Xkey_8:
-    case Xbumper:
+    case Xballoon:
+    case Xball_1:
+    case Xball_2:
     case Xswitch:
+    case Xbumper:
+    case Ybumper:
+    case Xacid_ne:
+    case Xacid_nw:
     case Xlenses:
     case Xmagnify:
+    case Xslide_ns:
+    case Xslide_ew:
     case Xroundwall_1:
     case Xroundwall_2:
     case Xroundwall_3:
     case Xroundwall_4:
       if (RANDOM(2))
       {
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Ystone_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Ystone_e;
          next[x+1][y] = Xstone_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Ystone_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Ystone_w;
          next[x-1][y] = Xstone_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
       else
       {
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Ystone_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Ystone_w;
          next[x-1][y] = Xstone_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Ystone_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Ystone_e;
          next[x+1][y] = Xstone_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
@@ -3853,9 +4435,8 @@ static void Lstone_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3864,7 +4445,6 @@ static void Lstone_pause(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ystone_s;
@@ -3882,9 +4462,9 @@ static void Lstone_pause(int x, int y)
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3899,11 +4479,10 @@ static void Lstone_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
-    case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
     case Zplayer:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xblank:
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3912,7 +4491,6 @@ static void Lstone_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ystone_s;
@@ -3930,19 +4508,32 @@ static void Lstone_fall(int x, int y)
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xnut:
-    case Xnut_pause:
-      next[x][y] = Xstone;
-      cave[x][y+1] = Ynut_stone;
-      next[x][y+1] = Xemerald;
-      play_element_sound(x, y, SOUND_crack, Xnut);
-      score += lev.nut_score;
+    case Xeater_n:
+    case Xeater_e:
+    case Xeater_s:
+    case Xeater_w:
+      cave[x][y] = Ystone_sB;
+      Lboom_next_new(x, y, Xblank);
+      cave[x][y+1] = Yeater_stone;
+      next[x][y+1] = Zeater;
+      Lboom_eater_old(x, y+1);
+      score += lev.eater_score;
+      return;
+
+    case Xalien:
+    case Xalien_pause:
+      cave[x][y] = Ystone_sB;
+      Lboom_next_new(x, y, Xblank);
+      cave[x][y+1] = Yalien_stone;
+      next[x][y+1] = Ztank;
+      Lboom_tank_old(x, y+1);
+      score += lev.alien_score;
       return;
 
     case Xbug_1_n:
@@ -3954,8 +4545,10 @@ static void Lstone_fall(int x, int y)
     case Xbug_2_s:
     case Xbug_2_w:
       cave[x][y] = Ystone_sB;
+      Lboom_next_new(x, y, Xblank);
       cave[x][y+1] = Ybug_stone;
-      Lboom_bug(x, y+1, Xstone_fall);
+      next[x][y+1] = Zbug;
+      Lboom_bug_old(x, y+1);
       score += lev.bug_score;
       return;
 
@@ -3968,75 +4561,48 @@ static void Lstone_fall(int x, int y)
     case Xtank_2_s:
     case Xtank_2_w:
       cave[x][y] = Ystone_sB;
+      Lboom_next_new(x, y, Xblank);
       cave[x][y+1] = Ytank_stone;
-      Lboom_tank(x, y+1, Xstone_fall);
+      next[x][y+1] = Ztank;
+      Lboom_tank_old(x, y+1);
       score += lev.tank_score;
       return;
 
-    case Xspring:
-      if (RANDOM(2))
-      {
-       switch (cave[x+1][y+1])
-       {
-         case Xblank:
-         case Xacid_splash_e:
-         case Xacid_splash_w:
-         case Xalien:
-         case Xalien_pause:
-           cave[x][y+1] = Xspring_e;
-           break;
-
-         default:
-           cave[x][y+1] = Xspring_w;
-           break;
-       }
-      }
-      else
-      {
-       switch (cave[x-1][y+1])
-       {
-         case Xblank:
-         case Xacid_splash_e:
-         case Xacid_splash_w:
-         case Xalien:
-         case Xalien_pause:
-           cave[x][y+1] = Xspring_w;
-           break;
-         default:
-           cave[x][y+1] = Xspring_e;
-           break;
-       }
-      }
-
-      next[x][y] = Xstone;
-      return;
-
-    case Xeater_n:
-    case Xeater_e:
-    case Xeater_s:
-    case Xeater_w:
-      cave[x][y] = Ystone_sB;
-      cave[x][y+1] = Yeater_stone;
-      Lboom_eater(x, y+1, Xstone_fall);
-      score += lev.eater_score;
-      return;
-
-    case Xalien:
-    case Xalien_pause:
-      cave[x][y] = Ystone_sB;
-      cave[x][y+1] = Yalien_stone;
-      Lboom_tank(x, y+1, Xstone_fall);
-      score += lev.alien_score;
-      return;
-
     case Xdiamond:
     case Xdiamond_pause:
       switch (cave[x][y+2])
       {
-       case Xblank:
-       case Xacid_splash_e:
-       case Xacid_splash_w:
        case Zplayer:
+       case Xblank:
+       case Xsplash_e:
+       case Xsplash_w:
+       case Xfake_acid_1:
+       case Xfake_acid_2:
+       case Xfake_acid_3:
+       case Xfake_acid_4:
+       case Xfake_acid_5:
+       case Xfake_acid_6:
+       case Xfake_acid_7:
+       case Xfake_acid_8:
+       case Xplant:
+       case Yplant:
+       case Xacid_1:
+       case Xacid_2:
+       case Xacid_3:
+       case Xacid_4:
+       case Xacid_5:
+       case Xacid_6:
+       case Xacid_7:
+       case Xacid_8:
+       case Xandroid:
+       case Xandroid_1_n:
+       case Xandroid_2_n:
+       case Xandroid_1_e:
+       case Xandroid_2_e:
+       case Xandroid_1_s:
+       case Xandroid_2_s:
+       case Xandroid_1_w:
+       case Xandroid_2_w:
        case Xbug_1_n:
        case Xbug_1_e:
        case Xbug_1_s:
@@ -4053,32 +4619,13 @@ static void Lstone_fall(int x, int y)
        case Xtank_2_e:
        case Xtank_2_s:
        case Xtank_2_w:
-       case Xspring_fall:
-       case Xandroid:
-       case Xandroid_1_n:
-       case Xandroid_2_n:
-       case Xandroid_1_e:
-       case Xandroid_2_e:
-       case Xandroid_1_s:
-       case Xandroid_2_s:
-       case Xandroid_1_w:
-       case Xandroid_2_w:
-       case Xstone_fall:
        case Xemerald_fall:
        case Xdiamond_fall:
+       case Xstone_fall:
        case Xbomb_fall:
-       case Xacid_s:
-       case Xacid_1:
-       case Xacid_2:
-       case Xacid_3:
-       case Xacid_4:
-       case Xacid_5:
-       case Xacid_6:
-       case Xacid_7:
-       case Xacid_8:
        case Xnut_fall:
-       case Xplant:
-       case Yplant:
+       case Xspring_fall:
+       case Xacid_s:
          next[x][y] = Xstone;
          play_element_sound(x, y, SOUND_stone, Xstone);
          return;
@@ -4093,23 +4640,87 @@ static void Lstone_fall(int x, int y)
 
     case Xbomb:
     case Xbomb_pause:
+      Lboom_cave_new(x, y, Xstone);
+      Lboom_next_new(x, y, Xstone);
       cave[x][y+1] = Ybomb_blank;
-      Lboom_tank(x, y+1, Xstone_fall);
+      next[x][y+1] = Ztank;
+      Lboom_tank_old(x, y+1);
+      return;
+
+    case Xnut:
+    case Xnut_pause:
+      next[x][y] = Xstone;
+      cave[x][y+1] = Ynut_stone;
+      next[x][y+1] = Xemerald;
+      play_element_sound(x, y, SOUND_crack, Xnut);
+      score += lev.nut_score;
+      return;
+
+    case Xspring:
+      if (RANDOM(2))
+      {
+       switch (cave[x+1][y+1])
+       {
+         case Xblank:
+         case Xsplash_e:
+         case Xsplash_w:
+         case Xfake_acid_1:
+         case Xfake_acid_2:
+         case Xfake_acid_3:
+         case Xfake_acid_4:
+         case Xfake_acid_5:
+         case Xfake_acid_6:
+         case Xfake_acid_7:
+         case Xfake_acid_8:
+         case Xalien:
+         case Xalien_pause:
+           cave[x][y+1] = Xspring_e;
+           break;
+
+         default:
+           cave[x][y+1] = Xspring_w;
+           break;
+       }
+      }
+      else
+      {
+       switch (cave[x-1][y+1])
+       {
+         case Xblank:
+         case Xsplash_e:
+         case Xsplash_w:
+         case Xfake_acid_1:
+         case Xfake_acid_2:
+         case Xfake_acid_3:
+         case Xfake_acid_4:
+         case Xfake_acid_5:
+         case Xfake_acid_6:
+         case Xfake_acid_7:
+         case Xfake_acid_8:
+         case Xalien:
+         case Xalien_pause:
+           cave[x][y+1] = Xspring_w;
+           break;
+         default:
+           cave[x][y+1] = Xspring_e;
+           break;
+       }
+      }
+
+      next[x][y] = Xstone;
       return;
 
     case Xwonderwall:
-      if (lev.wonderwall_time)
+      if (lev.wonderwall_time > 0)
       {
-       lev.wonderwall_state = 1;
+       lev.wonderwall_active = TRUE;
        cave[x][y] = Ystone_sB;
-
-       if (tab_blank[cave[x][y+2]])
+       next[x][y] = Xblank;
+       if (is_blank[cave[x][y+2]])
        {
          cave[x][y+2] = Yemerald_s;
          next[x][y+2] = Xemerald_fall;
        }
-
-       next[x][y] = Xblank;
        play_element_sound(x, y, SOUND_wonderfall, Xwonderwall);
        return;
       }
@@ -4127,8 +4738,16 @@ static void Lbomb(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ybomb_s;
@@ -4146,16 +4765,12 @@ static void Lbomb(int x, int y)
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -4165,23 +4780,20 @@ static void Lbomb(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -4190,49 +4802,65 @@ static void Lbomb(int x, int y)
     case Xkey_6:
     case Xkey_7:
     case Xkey_8:
-    case Xbumper:
+    case Xballoon:
+    case Xball_1:
+    case Xball_2:
     case Xswitch:
+    case Xbumper:
+    case Ybumper:
+    case Xacid_ne:
+    case Xacid_nw:
+    case Xslide_ns:
+    case Xslide_ew:
     case Xroundwall_1:
     case Xroundwall_2:
     case Xroundwall_3:
     case Xroundwall_4:
       if (RANDOM(2))
       {
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Ybomb_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Ybomb_e;
          next[x+1][y] = Xbomb_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Ybomb_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Ybomb_w;
          next[x-1][y] = Xbomb_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
       else
       {
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Ybomb_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Ybomb_w;
          next[x-1][y] = Xbomb_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Ybomb_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Ybomb_e;
          next[x+1][y] = Xbomb_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
@@ -4244,8 +4872,16 @@ static void Lbomb_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ybomb_s;
@@ -4263,9 +4899,9 @@ static void Lbomb_pause(int x, int y)
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4281,8 +4917,16 @@ static void Lbomb_fall(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ybomb_s;
@@ -4300,15 +4944,16 @@ static void Lbomb_fall(int x, int y)
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
     default:
       cave[x][y] = Ybomb_blank;
-      Lboom_tank(x, y, Xbomb_fall);
+      next[x][y] = Ztank;
+      Lboom_tank_old(x, y);
       return;
   }
 }
@@ -4318,8 +4963,16 @@ static void Lnut(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ynut_s;
@@ -4337,16 +4990,12 @@ static void Lnut(int x, int y)
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -4356,23 +5005,20 @@ static void Lnut(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -4381,49 +5027,65 @@ static void Lnut(int x, int y)
     case Xkey_6:
     case Xkey_7:
     case Xkey_8:
-    case Xbumper:
+    case Xballoon:
+    case Xball_1:
+    case Xball_2:
     case Xswitch:
+    case Xbumper:
+    case Ybumper:
+    case Xacid_ne:
+    case Xacid_nw:
+    case Xslide_ns:
+    case Xslide_ew:
     case Xroundwall_1:
     case Xroundwall_2:
     case Xroundwall_3:
     case Xroundwall_4:
       if (RANDOM(2))
       {
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Ynut_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Ynut_e;
          next[x+1][y] = Xnut_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Ynut_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Ynut_w;
          next[x-1][y] = Xnut_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
       else
       {
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Ynut_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Ynut_w;
          next[x-1][y] = Xnut_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Ynut_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Ynut_e;
          next[x+1][y] = Xnut_pause;
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
@@ -4435,8 +5097,16 @@ static void Lnut_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ynut_s;
@@ -4454,9 +5124,9 @@ static void Lnut_pause(int x, int y)
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4471,10 +5141,18 @@ static void Lnut_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
-    case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
     case Zplayer:
+    case Xblank:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ynut_s;
@@ -4492,9 +5170,9 @@ static void Lnut_fall(int x, int y)
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4511,8 +5189,16 @@ static void Lspring(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
       cave[x][y] = Yspring_sB;
@@ -4532,16 +5218,12 @@ static void Lspring(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -4551,23 +5233,20 @@ static void Lspring(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -4576,77 +5255,81 @@ static void Lspring(int x, int y)
     case Xkey_6:
     case Xkey_7:
     case Xkey_8:
-    case Xbumper:
+    case Xballoon:
+    case Xball_1:
+    case Xball_2:
     case Xswitch:
+    case Xbumper:
+    case Ybumper:
+    case Xacid_ne:
+    case Xacid_nw:
+    case Xslide_ns:
+    case Xslide_ew:
     case Xroundwall_1:
     case Xroundwall_2:
     case Xroundwall_3:
     case Xroundwall_4:
       if (RANDOM(2))
       {
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Yspring_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Yspring_e;
-         if (cave[x][y+1] == Xbumper)
-           cave[x][y+1] = XbumperB;
-
 #ifdef SPRING_ROLL
          next[x+1][y] = Xspring_e;
 #else
          next[x+1][y] = Xspring_pause;
 #endif
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Yspring_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Yspring_w;
-         if (cave[x][y+1] == Xbumper)
-           cave[x][y+1] = XbumperB;
-
 #ifdef SPRING_ROLL
          next[x-1][y] = Xspring_w;
 #else
          next[x-1][y] = Xspring_pause;
 #endif
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
       else
       {
-       if (tab_blank[cave[x-1][y]] && tab_acid[cave[x-1][y+1]])
+       if (is_blank[cave[x-1][y]] && is_blank_or_acid[cave[x-1][y+1]])
        {
          cave[x][y] = Yspring_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Yspring_w;
-         if (cave[x][y+1] == Xbumper)
-           cave[x][y+1] = XbumperB;
-
 #ifdef SPRING_ROLL
          next[x-1][y] = Xspring_w;
 #else
          next[x-1][y] = Xspring_pause;
 #endif
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
 
-       if (tab_blank[cave[x+1][y]] && tab_acid[cave[x+1][y+1]])
+       if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]])
        {
          cave[x][y] = Yspring_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Yspring_e;
-         if (cave[x][y+1] == Xbumper)
-           cave[x][y+1] = XbumperB;
-
 #ifdef SPRING_ROLL
          next[x+1][y] = Xspring_e;
 #else
          next[x+1][y] = Xspring_pause;
 #endif
+         if (cave[x][y+1] == Xbumper)
+           cave[x][y+1] = Ybumper;
          return;
        }
       }
@@ -4658,8 +5341,16 @@ static void Lspring_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -4677,9 +5368,9 @@ static void Lspring_pause(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4695,8 +5386,16 @@ static void Lspring_e(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -4714,21 +5413,29 @@ static void Lspring_e(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
     case Xbumper:
-      cave[x][y+1] = XbumperB;
+      cave[x][y+1] = Ybumper;
   }
 
   switch (cave[x+1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Yalien_nB:
     case Yalien_eB:
     case Yalien_sB:
@@ -4750,9 +5457,9 @@ static void Lspring_e(int x, int y)
       cave[x][y] = Yspring_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-       cave[x+2][y-1] = Xacid_splash_e;
+       cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_w;
+       cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4771,8 +5478,8 @@ static void Lspring_e(int x, int y)
       return;
 
     case Xbumper:
-    case XbumperB:
-      cave[x+1][y] = XbumperB;
+    case Ybumper:
+      cave[x+1][y] = Ybumper;
       next[x][y] = Xspring_w;
       play_element_sound(x, y, SOUND_spring, Xspring);
       return;
@@ -4790,8 +5497,16 @@ static void Lspring_w(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -4809,21 +5524,29 @@ static void Lspring_w(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
     case Xbumper:
-      cave[x][y+1] = XbumperB;
+      cave[x][y+1] = Ybumper;
   }
 
   switch (cave[x-1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Yalien_nB:
     case Yalien_eB:
     case Yalien_sB:
@@ -4845,9 +5568,9 @@ static void Lspring_w(int x, int y)
       cave[x][y] = Yspring_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-       cave[x][y-1] = Xacid_splash_e;
+       cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-       cave[x-2][y-1] = Xacid_splash_w;
+       cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4866,8 +5589,8 @@ static void Lspring_w(int x, int y)
       return;
 
     case Xbumper:
-    case XbumperB:
-      cave[x-1][y] = XbumperB;
+    case Ybumper:
+      cave[x-1][y] = Ybumper;
       next[x][y] = Xspring_e;
       play_element_sound(x, y, SOUND_spring, Xspring);
       return;
@@ -4884,10 +5607,18 @@ static void Lspring_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
-    case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
     case Zplayer:
+    case Xblank:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -4905,16 +5636,32 @@ static void Lspring_fall(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xbomb:
-    case Xbomb_pause:
-      cave[x][y+1] = Ybomb_blank;
-      Lboom_tank(x, y+1, Xspring_fall);
+    case Xeater_n:
+    case Xeater_e:
+    case Xeater_s:
+    case Xeater_w:
+      cave[x][y] = Yspring_sB;
+      next[x][y] = Xblank;
+      cave[x][y+1] = Yeater_spring;
+      next[x][y+1] = Zeater;
+      Lboom_eater_old(x, y+1);
+      score += lev.eater_score;
+      return;
+
+    case Xalien:
+    case Xalien_pause:
+      cave[x][y] = Yspring_sB;
+      next[x][y] = Xblank;
+      cave[x][y+1] = Yalien_spring;
+      next[x][y+1] = Ztank;
+      Lboom_tank_old(x, y+1);
+      score += lev.alien_score;
       return;
 
     case Xbug_1_n:
@@ -4926,8 +5673,10 @@ static void Lspring_fall(int x, int y)
     case Xbug_2_s:
     case Xbug_2_w:
       cave[x][y] = Yspring_sB;
+      next[x][y] = Xblank;
       cave[x][y+1] = Ybug_spring;
-      Lboom_bug(x, y+1, Xspring_fall);
+      next[x][y+1] = Zbug;
+      Lboom_bug_old(x, y+1);
       score += lev.bug_score;
       return;
 
@@ -4940,27 +5689,20 @@ static void Lspring_fall(int x, int y)
     case Xtank_2_s:
     case Xtank_2_w:
       cave[x][y] = Yspring_sB;
+      next[x][y] = Xblank;
       cave[x][y+1] = Ytank_spring;
-      Lboom_tank(x, y+1, Xspring_fall);
+      next[x][y+1] = Ztank;
+      Lboom_tank_old(x, y+1);
       score += lev.tank_score;
       return;
 
-    case Xeater_n:
-    case Xeater_e:
-    case Xeater_s:
-    case Xeater_w:
-      cave[x][y] = Yspring_sB;
-      cave[x][y+1] = Yeater_spring;
-      Lboom_eater(x, y+1, Xspring_fall);
-      score += lev.eater_score;
-      return;
-
-    case Xalien:
-    case Xalien_pause:
-      cave[x][y] = Yspring_sB;
-      cave[x][y+1] = Yalien_spring;
-      Lboom_tank(x, y+1, Xspring_fall);
-      score += lev.alien_score;
+    case Xbomb:
+    case Xbomb_pause:
+      cave[x][y] = Xspring;
+      next[x][y] = Xspring;
+      cave[x][y+1] = Ybomb_blank;
+      next[x][y+1] = Ztank;
+      Lboom_tank_old(x, y+1);
       return;
 
     default:
@@ -4973,302 +5715,578 @@ static void Lspring_fall(int x, int y)
 
 static void Lpush_emerald_e(int x, int y)
 {
+  cave[x][y] = Yemerald_eB;
+  next[x][y] = Xblank;
+
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xemerald;
-      next[x][y] = Xemerald;
+      Lpush_element_old(x, y, Xemerald);
       return;
 
-    default:
-      cave[x][y] = Yemerald_eB;
-      next[x][y] = Xblank;
-      cave[x+1][y] = Yemerald_e;
-      next[x+1][y] = Xemerald_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x+2][y-1] == Xblank)
+       cave[x+2][y-1] = Xsplash_e;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x+1][y] = Yemerald_e;
+  next[x+1][y] = Xemerald_pause;
 }
 
 static void Lpush_emerald_w(int x, int y)
 {
+  cave[x][y] = Yemerald_wB;
+  next[x][y] = Xblank;
+
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xemerald;
-      next[x][y] = Xemerald;
+      Lpush_element_old(x, y, Xemerald);
       return;
 
-    default:
-      cave[x][y] = Yemerald_wB;
-      next[x][y] = Xblank;
-      cave[x-1][y] = Yemerald_w;
-      next[x-1][y] = Xemerald_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_e;
+      if (cave[x-2][y-1] == Xblank)
+       cave[x-2][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x-1][y] = Yemerald_w;
+  next[x-1][y] = Xemerald_pause;
 }
 
 static void Lpush_diamond_e(int x, int y)
 {
+  cave[x][y] = Ydiamond_eB;
+  next[x][y] = Xblank;
+
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xdiamond;
-      next[x][y] = Xdiamond;
+      Lpush_element_old(x, y, Xdiamond);
       return;
 
-    default:
-      cave[x][y] = Ydiamond_eB;
-      next[x][y] = Xblank;
-      cave[x+1][y] = Ydiamond_e;
-      next[x+1][y] = Xdiamond_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x+2][y-1] == Xblank)
+       cave[x+2][y-1] = Xsplash_e;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x+1][y] = Ydiamond_e;
+  next[x+1][y] = Xdiamond_pause;
 }
 
 static void Lpush_diamond_w(int x, int y)
 {
+  cave[x][y] = Ydiamond_wB;
+  next[x][y] = Xblank;
+
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xdiamond;
-      next[x][y] = Xdiamond;
+      Lpush_element_old(x, y, Xdiamond);
       return;
 
-    default:
-      cave[x][y] = Ydiamond_wB;
-      next[x][y] = Xblank;
-      cave[x-1][y] = Ydiamond_w;
-      next[x-1][y] = Xdiamond_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_e;
+      if (cave[x-2][y-1] == Xblank)
+       cave[x-2][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x-1][y] = Ydiamond_w;
+  next[x-1][y] = Xdiamond_pause;
 }
 
 static void Lpush_stone_e(int x, int y)
 {
+  cave[x][y] = Ystone_eB;
+  next[x][y] = Xblank;
+
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xstone;
-      next[x][y] = Xstone;
+      Lpush_element_old(x, y, Xstone);
       return;
 
-    default:
-      cave[x][y] = Ystone_eB;
-      next[x][y] = Xblank;
-      cave[x+1][y] = Ystone_e;
-      next[x+1][y] = Xstone_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x+2][y-1] == Xblank)
+       cave[x+2][y-1] = Xsplash_e;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x+1][y] = Ystone_e;
+  next[x+1][y] = Xstone_pause;
 }
 
 static void Lpush_stone_w(int x, int y)
 {
+  cave[x][y] = Ystone_wB;
+  next[x][y] = Xblank;
+
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xstone;
-      next[x][y] = Xstone;
+      Lpush_element_old(x, y, Xstone);
       return;
 
-    default:
-      cave[x][y] = Ystone_wB;
-      next[x][y] = Xblank;
-      cave[x-1][y] = Ystone_w;
-      next[x-1][y] = Xstone_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_e;
+      if (cave[x-2][y-1] == Xblank)
+       cave[x-2][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x-1][y] = Ystone_w;
+  next[x-1][y] = Xstone_pause;
 }
 
 static void Lpush_bomb_e(int x, int y)
 {
+  cave[x][y] = Ybomb_eB;
+  next[x][y] = Xblank;
+
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xbomb;
-      next[x][y] = Xbomb;
+      Lpush_element_old(x, y, Xbomb);
       return;
 
-    default:
-      cave[x][y] = Ybomb_eB;
-      next[x][y] = Xblank;
-      cave[x+1][y] = Ybomb_e;
-      next[x+1][y] = Xbomb_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x+2][y-1] == Xblank)
+       cave[x+2][y-1] = Xsplash_e;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x+1][y] = Ybomb_e;
+  next[x+1][y] = Xbomb_pause;
 }
 
 static void Lpush_bomb_w(int x, int y)
 {
+  cave[x][y] = Ybomb_wB;
+  next[x][y] = Xblank;
+
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xbomb;
-      next[x][y] = Xbomb;
+      Lpush_element_old(x, y, Xbomb);
       return;
 
-    default:
-      cave[x][y] = Ybomb_wB;
-      next[x][y] = Xblank;
-      cave[x-1][y] = Ybomb_w;
-      next[x-1][y] = Xbomb_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_e;
+      if (cave[x-2][y-1] == Xblank)
+       cave[x-2][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x-1][y] = Ybomb_w;
+  next[x-1][y] = Xbomb_pause;
 }
 
 static void Lpush_nut_e(int x, int y)
 {
+  cave[x][y] = Ynut_eB;
+  next[x][y] = Xblank;
+
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xnut;
-      next[x][y] = Xnut;
+      Lpush_element_old(x, y, Xnut);
       return;
 
-    default:
-      cave[x][y] = Ynut_eB;
-      next[x][y] = Xblank;
-      cave[x+1][y] = Ynut_e;
-      next[x+1][y] = Xnut_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x+2][y-1] == Xblank)
+       cave[x+2][y-1] = Xsplash_e;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x+1][y] = Ynut_e;
+  next[x+1][y] = Xnut_pause;
 }
 
 static void Lpush_nut_w(int x, int y)
 {
+  cave[x][y] = Ynut_wB;
+  next[x][y] = Xblank;
+
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xnut;
-      next[x][y] = Xnut;
+      Lpush_element_old(x, y, Xnut);
       return;
 
-    default:
-      cave[x][y] = Ynut_wB;
-      next[x][y] = Xblank;
-      cave[x-1][y] = Ynut_w;
-      next[x-1][y] = Xnut_pause;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_e;
+      if (cave[x-2][y-1] == Xblank)
+       cave[x-2][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x-1][y] = Ynut_w;
+  next[x-1][y] = Xnut_pause;
 }
 
 static void Lpush_spring_e(int x, int y)
 {
+  cave[x][y] = Yspring_eB;
+  next[x][y] = Xblank;
+
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xspring;
-      next[x][y] = Xspring;
+      Lpush_element_old(x, y, Xspring);
       return;
 
-    default:
-      cave[x][y] = Yspring_eB;
-      next[x][y] = Xblank;
-      cave[x+1][y] = Yspring_e;
-      next[x+1][y] = Xspring_e;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x+2][y-1] == Xblank)
+       cave[x+2][y-1] = Xsplash_e;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x+1][y] = Yspring_e;
+  next[x+1][y] = Xspring_e;
 }
 
 static void Lpush_spring_w(int x, int y)
 {
+  cave[x][y] = Yspring_wB;
+  next[x][y] = Xblank;
+
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
-    case Znormal:
+    case Zbug:
+    case Ztank:
+    case Zeater:
     case Zdynamite:
+    case Zboom:
+    case Xchain:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
-    case Zplayer:
-      cave[x][y] = Xspring;
-      next[x][y] = Xspring;
+      Lpush_element_old(x, y, Xspring);
       return;
 
-    default:
-      cave[x][y] = Yspring_wB;
-      next[x][y] = Xblank;
-      cave[x-1][y] = Yspring_w;
-      next[x-1][y] = Xspring_w;
+#ifdef ACID_ROLL
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
+      if (cave[x][y-1] == Xblank)
+       cave[x][y-1] = Xsplash_e;
+      if (cave[x-2][y-1] == Xblank)
+       cave[x-2][y-1] = Xsplash_w;
+      play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
+#endif
   }
+
+  cave[x-1][y] = Yspring_w;
+  next[x-1][y] = Xspring_w;
 }
 
 static void Ldynamite_1(int x, int y)
@@ -5356,8 +6374,16 @@ static void Lballoon(int x, int y)
       switch (cave[x][y-1])
       {
        case Xblank:
-       case Xacid_splash_e:
-       case Xacid_splash_w:
+       case Xsplash_e:
+       case Xsplash_w:
+       case Xfake_acid_1:
+       case Xfake_acid_2:
+       case Xfake_acid_3:
+       case Xfake_acid_4:
+       case Xfake_acid_5:
+       case Xfake_acid_6:
+       case Xfake_acid_7:
+       case Xfake_acid_8:
          cave[x][y] = Yballoon_nB;
          next[x][y] = Xblank;
          cave[x][y-1] = Yballoon_n;
@@ -5375,9 +6401,9 @@ static void Lballoon(int x, int y)
          cave[x][y] = Yballoon_nB;
          next[x][y] = Xblank;
          if (cave[x+1][y-2] == Xblank)
-           cave[x+1][y-2] = Xacid_splash_e;
+           cave[x+1][y-2] = Xsplash_e;
          if (cave[x-1][y-2] == Xblank)
-           cave[x-1][y-2] = Xacid_splash_w;
+           cave[x-1][y-2] = Xsplash_w;
          play_element_sound(x, y, SOUND_acid, Xacid_1);
          return;
       }
@@ -5387,8 +6413,16 @@ static void Lballoon(int x, int y)
       switch (cave[x+1][y])
       {
        case Xblank:
-       case Xacid_splash_e:
-       case Xacid_splash_w:
+       case Xsplash_e:
+       case Xsplash_w:
+       case Xfake_acid_1:
+       case Xfake_acid_2:
+       case Xfake_acid_3:
+       case Xfake_acid_4:
+       case Xfake_acid_5:
+       case Xfake_acid_6:
+       case Xfake_acid_7:
+       case Xfake_acid_8:
          cave[x][y] = Yballoon_eB;
          next[x][y] = Xblank;
          cave[x+1][y] = Yballoon_e;
@@ -5406,9 +6440,9 @@ static void Lballoon(int x, int y)
          cave[x][y] = Yballoon_eB;
          next[x][y] = Xblank;
          if (cave[x+2][y-1] == Xblank)
-           cave[x+2][y-1] = Xacid_splash_e;
+           cave[x+2][y-1] = Xsplash_e;
          if (cave[x][y-1] == Xblank)
-           cave[x][y-1] = Xacid_splash_w;
+           cave[x][y-1] = Xsplash_w;
          play_element_sound(x, y, SOUND_acid, Xacid_1);
          return;
       }
@@ -5418,8 +6452,16 @@ static void Lballoon(int x, int y)
       switch (cave[x][y+1])
       {
        case Xblank:
-       case Xacid_splash_e:
-       case Xacid_splash_w:
+       case Xsplash_e:
+       case Xsplash_w:
+       case Xfake_acid_1:
+       case Xfake_acid_2:
+       case Xfake_acid_3:
+       case Xfake_acid_4:
+       case Xfake_acid_5:
+       case Xfake_acid_6:
+       case Xfake_acid_7:
+       case Xfake_acid_8:
          cave[x][y] = Yballoon_sB;
          next[x][y] = Xblank;
          cave[x][y+1] = Yballoon_s;
@@ -5437,9 +6479,9 @@ static void Lballoon(int x, int y)
          cave[x][y] = Yballoon_sB;
          next[x][y] = Xblank;
          if (cave[x+1][y] == Xblank)
-           cave[x+1][y] = Xacid_splash_e;
+           cave[x+1][y] = Xsplash_e;
          if (cave[x-1][y] == Xblank)
-           cave[x-1][y] = Xacid_splash_w;
+           cave[x-1][y] = Xsplash_w;
          play_element_sound(x, y, SOUND_acid, Xacid_1);
          return;
       }
@@ -5449,8 +6491,16 @@ static void Lballoon(int x, int y)
       switch (cave[x-1][y])
       {
        case Xblank:
-       case Xacid_splash_e:
-       case Xacid_splash_w:
+       case Xsplash_e:
+       case Xsplash_w:
+       case Xfake_acid_1:
+       case Xfake_acid_2:
+       case Xfake_acid_3:
+       case Xfake_acid_4:
+       case Xfake_acid_5:
+       case Xfake_acid_6:
+       case Xfake_acid_7:
+       case Xfake_acid_8:
          cave[x][y] = Yballoon_wB;
          next[x][y] = Xblank;
          cave[x-1][y] = Yballoon_w;
@@ -5468,9 +6518,9 @@ static void Lballoon(int x, int y)
          cave[x][y] = Yballoon_wB;
          next[x][y] = Xblank;
          if (cave[x][y-1] == Xblank)
-           cave[x][y-1] = Xacid_splash_e;
+           cave[x][y-1] = Xsplash_e;
          if (cave[x-2][y-1] == Xblank)
-           cave[x-2][y-1] = Xacid_splash_w;
+           cave[x-2][y-1] = Xsplash_w;
          play_element_sound(x, y, SOUND_acid, Xacid_1);
          return;
       }
@@ -5488,7 +6538,7 @@ static void Lball_common(int x, int y)
     {
       case 0:
        if (lev.ball_array[lev.ball_pos][0] != Xblank &&
-           tab_blank[cave[x-1][y-1]])
+           is_blank[cave[x-1][y-1]])
        {
          cave[x-1][y-1] = Yball_blank;
          next[x-1][y-1] = lev.ball_array[lev.ball_pos][0];
@@ -5497,7 +6547,7 @@ static void Lball_common(int x, int y)
 
       case 1:
        if (lev.ball_array[lev.ball_pos][1] != Xblank &&
-           tab_blank[cave[x][y-1]])
+           is_blank[cave[x][y-1]])
        {
          cave[x][y-1] = Yball_blank;
          next[x][y-1] = lev.ball_array[lev.ball_pos][1];
@@ -5506,7 +6556,7 @@ static void Lball_common(int x, int y)
 
       case 2:
        if (lev.ball_array[lev.ball_pos][2] != Xblank &&
-           tab_blank[cave[x+1][y-1]])
+           is_blank[cave[x+1][y-1]])
        {
          cave[x+1][y-1] = Yball_blank;
          next[x+1][y-1] = lev.ball_array[lev.ball_pos][2];
@@ -5515,7 +6565,7 @@ static void Lball_common(int x, int y)
 
       case 3:
        if (lev.ball_array[lev.ball_pos][3] != Xblank &&
-           tab_blank[cave[x-1][y]])
+           is_blank[cave[x-1][y]])
        {
          cave[x-1][y] = Yball_blank;
          next[x-1][y] = lev.ball_array[lev.ball_pos][3];
@@ -5524,7 +6574,7 @@ static void Lball_common(int x, int y)
 
       case 4:
        if (lev.ball_array[lev.ball_pos][4] != Xblank &&
-           tab_blank[cave[x+1][y]])
+           is_blank[cave[x+1][y]])
        {
          cave[x+1][y] = Yball_blank;
          next[x+1][y] = lev.ball_array[lev.ball_pos][4];
@@ -5533,7 +6583,7 @@ static void Lball_common(int x, int y)
 
       case 5:
        if (lev.ball_array[lev.ball_pos][5] != Xblank &&
-           tab_blank[cave[x-1][y+1]])
+           is_blank[cave[x-1][y+1]])
        {
          cave[x-1][y+1] = Yball_blank;
          next[x-1][y+1] = lev.ball_array[lev.ball_pos][5];
@@ -5542,7 +6592,7 @@ static void Lball_common(int x, int y)
 
       case 6:
        if (lev.ball_array[lev.ball_pos][6] != Xblank &&
-           tab_blank[cave[x][y+1]])
+           is_blank[cave[x][y+1]])
        {
          cave[x][y+1] = Yball_blank;
          next[x][y+1] = lev.ball_array[lev.ball_pos][6];
@@ -5551,7 +6601,7 @@ static void Lball_common(int x, int y)
 
       case 7:
        if (lev.ball_array[lev.ball_pos][7] != Xblank &&
-           tab_blank[cave[x+1][y+1]])
+           is_blank[cave[x+1][y+1]])
        {
          cave[x+1][y+1] = Yball_blank;
          next[x+1][y+1] = lev.ball_array[lev.ball_pos][7];
@@ -5562,56 +6612,56 @@ static void Lball_common(int x, int y)
   else
   {
     if (lev.ball_array[lev.ball_pos][0] != Xblank &&
-       tab_blank[cave[x-1][y-1]])
+       is_blank[cave[x-1][y-1]])
     {
       cave[x-1][y-1] = Yball_blank;
       next[x-1][y-1] = lev.ball_array[lev.ball_pos][0];
     }
 
     if (lev.ball_array[lev.ball_pos][1] != Xblank &&
-       tab_blank[cave[x][y-1]])
+       is_blank[cave[x][y-1]])
     {
       cave[x][y-1] = Yball_blank;
       next[x][y-1] = lev.ball_array[lev.ball_pos][1];
     }
 
     if (lev.ball_array[lev.ball_pos][2] != Xblank &&
-       tab_blank[cave[x+1][y-1]])
+       is_blank[cave[x+1][y-1]])
     {
       cave[x+1][y-1] = Yball_blank;
       next[x+1][y-1] = lev.ball_array[lev.ball_pos][2];
     }
 
     if (lev.ball_array[lev.ball_pos][3] != Xblank &&
-       tab_blank[cave[x-1][y]])
+       is_blank[cave[x-1][y]])
     {
       cave[x-1][y] = Yball_blank;
       next[x-1][y] = lev.ball_array[lev.ball_pos][3];
     }
 
     if (lev.ball_array[lev.ball_pos][4] != Xblank &&
-       tab_blank[cave[x+1][y]])
+       is_blank[cave[x+1][y]])
     {
       cave[x+1][y] = Yball_blank;
       next[x+1][y] = lev.ball_array[lev.ball_pos][4];
     }
 
     if (lev.ball_array[lev.ball_pos][5] != Xblank &&
-       tab_blank[cave[x-1][y+1]])
+       is_blank[cave[x-1][y+1]])
     {
       cave[x-1][y+1] = Yball_blank;
       next[x-1][y+1] = lev.ball_array[lev.ball_pos][5];
     }
 
     if (lev.ball_array[lev.ball_pos][6] != Xblank &&
-       tab_blank[cave[x][y+1]])
+       is_blank[cave[x][y+1]])
     {
       cave[x][y+1] = Yball_blank;
       next[x][y+1] = lev.ball_array[lev.ball_pos][6];
     }
 
     if (lev.ball_array[lev.ball_pos][7] != Xblank &&
-       tab_blank[cave[x+1][y+1]])
+       is_blank[cave[x+1][y+1]])
     {
       cave[x+1][y+1] = Yball_blank;
       next[x+1][y+1] = lev.ball_array[lev.ball_pos][7];
@@ -5623,7 +6673,7 @@ static void Lball_common(int x, int y)
 
 static void Lball_1(int x, int y)
 {
-  if (lev.ball_state == 0)
+  if (!lev.ball_active)
     return;
 
   cave[x][y] = Yball_1;
@@ -5636,7 +6686,7 @@ static void Lball_1(int x, int y)
 
 static void Lball_2(int x, int y)
 {
-  if (lev.ball_state == 0)
+  if (!lev.ball_active)
     return;
 
   cave[x][y] = Yball_2;
@@ -5658,12 +6708,20 @@ static void Ldrip_fall(int x, int y)
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ydrip_1_sB;
       next[x][y] = Xdrip_stretchB;
       cave[x][y+1] = Ydrip_1_s;
@@ -5681,9 +6739,9 @@ static void Ldrip_fall(int x, int y)
       cave[x][y] = Ydrip_1_sB;
       next[x][y] = Xdrip_stretchB;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -5721,9 +6779,9 @@ static void Ldrip_stretchB(int x, int y)
 
 static void Lwonderwall(int x, int y)
 {
-  if (lev.wonderwall_time && lev.wonderwall_state)
+  if (lev.wonderwall_time > 0 && lev.wonderwall_active)
   {
-    cave[x][y] = XwonderwallB;
+    cave[x][y] = Ywonderwall;
     play_element_sound(x, y, SOUND_wonder, Xwonderwall);
   }
 }
@@ -5731,31 +6789,31 @@ static void Lwonderwall(int x, int y)
 static void Lwheel(int x, int y)
 {
   if (lev.wheel_cnt && x == lev.wheel_x && y == lev.wheel_y)
-    cave[x][y] = XwheelB;
+    cave[x][y] = Ywheel;
 }
 
 static void Lswitch(int x, int y)
 {
-  if (lev.ball_state)
-    cave[x][y] = XswitchB;
+  if (lev.ball_active)
+    cave[x][y] = Yswitch;
 }
 
 static void Lfake_blank(int x, int y)
 {
   if (lev.lenses_cnt)
-    cave[x][y] = Xfake_blankB;
+    cave[x][y] = Yfake_blank;
 }
 
 static void Lfake_grass(int x, int y)
 {
   if (lev.magnify_cnt)
-    cave[x][y] = Xfake_grassB;
+    cave[x][y] = Yfake_grass;
 }
 
 static void Lfake_amoeba(int x, int y)
 {
   if (lev.lenses_cnt)
-    cave[x][y] = Xfake_amoebaB;
+    cave[x][y] = Yfake_amoeba;
 }
 
 static void Lsand_stone(int x, int y)
@@ -5763,8 +6821,16 @@ static void Lsand_stone(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
       cave[x][y] = Xsand_stonesand_quickout_1;
       next[x][y] = Xsand_stonesand_quickout_2;
       cave[x][y+1] = Xsand_stoneout_1;
@@ -5782,9 +6848,9 @@ static void Lsand_stone(int x, int y)
       cave[x][y] = Xsand_stonesand_quickout_1;
       next[x][y] = Xsand_stonesand_quickout_2;
       if (cave[x+1][y] == Xblank)
-       cave[x+1][y] = Xacid_splash_e;
+       cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-       cave[x-1][y] = Xacid_splash_w;
+       cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -5867,7 +6933,6 @@ static void Lsand_stoneout_2(int x, int y)
   next[x][y] = Xstone_fall;
 }
 
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
 static void Lsand_stonesand_quickout_1(int x, int y)
 {
   next[x][y] = Xsand_stonesand_quickout_2;
@@ -5877,45 +6942,44 @@ static void Lsand_stonesand_quickout_2(int x, int y)
 {
   next[x][y] = Xsand;
 }
-#endif
 
-static void Lslidewall_ns(int x, int y)
+static void Lslide_ns(int x, int y)
 {
-  if (tab_blank[cave[x][y-1]])
+  if (is_blank[cave[x][y-1]])
   {
-    cave[x][y-1] = Yslidewall_ns_blank;
-    next[x][y-1] = Xslidewall_ns;
-    play_element_sound(x, y, SOUND_slidewall, Xslidewall_ns);
+    cave[x][y-1] = Yslide_ns_blank;
+    next[x][y-1] = Xslide_ns;
+    play_element_sound(x, y, SOUND_slide, Xslide_ns);
   }
 
-  if (tab_blank[cave[x][y+1]])
+  if (is_blank[cave[x][y+1]])
   {
-    cave[x][y+1] = Yslidewall_ns_blank;
-    next[x][y+1] = Xslidewall_ns;
-    play_element_sound(x, y, SOUND_slidewall, Xslidewall_ns);
+    cave[x][y+1] = Yslide_ns_blank;
+    next[x][y+1] = Xslide_ns;
+    play_element_sound(x, y, SOUND_slide, Xslide_ns);
   }
 }
 
-static void Lslidewall_ew(int x, int y)
+static void Lslide_ew(int x, int y)
 {
-  if (tab_blank[cave[x+1][y]])
+  if (is_blank[cave[x+1][y]])
   {
-    cave[x+1][y] = Yslidewall_ew_blank;
-    next[x+1][y] = Xslidewall_ew;
-    play_element_sound(x, y, SOUND_slidewall, Xslidewall_ew);
+    cave[x+1][y] = Yslide_ew_blank;
+    next[x+1][y] = Xslide_ew;
+    play_element_sound(x, y, SOUND_slide, Xslide_ew);
   }
 
-  if (tab_blank[cave[x-1][y]])
+  if (is_blank[cave[x-1][y]])
   {
-    cave[x-1][y] = Yslidewall_ew_blank;
-    next[x-1][y] = Xslidewall_ew;
-    play_element_sound(x, y, SOUND_slidewall, Xslidewall_ew);
+    cave[x-1][y] = Yslide_ew_blank;
+    next[x-1][y] = Xslide_ew;
+    play_element_sound(x, y, SOUND_slide, Xslide_ew);
   }
 }
 
 static void Lexit(int x, int y)
 {
-  if (lev.required > 0)
+  if (lev.gems_needed > 0)
     return;
 
   switch (RANDOM(64) / 21)
@@ -5964,47 +7028,157 @@ static void Lamoeba(int x, int y)
   switch (cave[x][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
+    case Xsplash_e:
+    case Xsplash_w:
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
+    case Xplant:
+    case Yplant:
     case Xgrass:
     case Xdirt:
     case Xsand:
+      if (is_amoeba[cave[x][y-1]] ||
+         is_amoeba[cave[x+1][y]] ||
+         is_amoeba[cave[x][y+1]] ||
+         is_amoeba[cave[x-1][y]])
+       cave[x][y] = Xdrip;
+  }
+}
+
+static void Lboom_one(int x, int y, boolean by_dynamite)
+{
+  switch (cave[x][y])
+  {
+    case Zborder:
+    case Zbug:
+    case Ztank:
+    case Zeater:
+    case Zdynamite:
+    case Zboom:
+    case Xchain:
+    case Xboom_bug:
+    case Xboom_tank:
+    case Xboom_android:
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
     case Xplant:
     case Yplant:
-      if (tab_amoeba[cave[x][y-1]] ||
-         tab_amoeba[cave[x+1][y]] ||
-         tab_amoeba[cave[x][y+1]] ||
-         tab_amoeba[cave[x-1][y]])
-       cave[x][y] = Xdrip;
+    case Xdoor_1:
+    case Xdoor_2:
+    case Xdoor_3:
+    case Xdoor_4:
+    case Xdoor_5:
+    case Xdoor_6:
+    case Xdoor_7:
+    case Xdoor_8:
+    case Xfake_door_1:
+    case Xfake_door_2:
+    case Xfake_door_3:
+    case Xfake_door_4:
+    case Xfake_door_5:
+    case Xfake_door_6:
+    case Xfake_door_7:
+    case Xfake_door_8:
+    case Xacid_ne:
+    case Xacid_nw:
+    case Xacid_s:
+    case Xacid_se:
+    case Xacid_sw:
+    case Xsteel_1:
+    case Xsteel_2:
+    case Xsteel_3:
+    case Xsteel_4:
+      return;
+
+    case Xandroid:
+    case Xandroid_1_n:
+    case Xandroid_2_n:
+    case Xandroid_1_e:
+    case Xandroid_2_e:
+    case Xandroid_1_s:
+    case Xandroid_2_s:
+    case Xandroid_1_w:
+    case Xandroid_2_w:
+      if (by_dynamite)
+       cave[x][y] = Xboom_android;
+      return;
+
+    case Xbug_1_n:
+    case Xbug_1_e:
+    case Xbug_1_s:
+    case Xbug_1_w:
+    case Xbug_2_n:
+    case Xbug_2_e:
+    case Xbug_2_s:
+    case Xbug_2_w:
+      cave[x][y] = Xboom_bug;
+      Lboom_bug_new(x, y, TRUE);
+      return;
+
+    case Xbomb:
+    case Xbomb_pause:
+    case Xbomb_fall:
+      cave[x][y] = Xboom_tank;
+      Lboom_tank_new(x, y, TRUE);
+      return;
+
+    default:
+      cave[x][y] = Xboom_1;
+      return;
   }
 }
 
+static void Lboom_nine(int x, int y, boolean by_dynamite)
+{
+  Lboom_one(x,   y-1, by_dynamite);
+  Lboom_one(x-1, y,   by_dynamite);
+  Lboom_one(x+1, y,   by_dynamite);
+  Lboom_one(x,   y+1, by_dynamite);
+  Lboom_one(x-1, y-1, by_dynamite);
+  Lboom_one(x+1, y-1, by_dynamite);
+  Lboom_one(x-1, y+1, by_dynamite);
+  Lboom_one(x+1, y+1, by_dynamite);
+
+  cave[x][y] = Xboom_1;
+}
+
 static void Lexplode(int x, int y)
 {
   switch (cave[x][y])
   {
-    case Znormal:
-      cave[x][y]     = Xboom_1;
-      cave[x][y-1]   = tab_explode_normal[cave[x][y-1]];
-      cave[x-1][y]   = tab_explode_normal[cave[x-1][y]];
-      cave[x+1][y]   = tab_explode_normal[cave[x+1][y]];
-      cave[x][y+1]   = tab_explode_normal[cave[x][y+1]];
-      cave[x-1][y-1] = tab_explode_normal[cave[x-1][y-1]];
-      cave[x+1][y-1] = tab_explode_normal[cave[x+1][y-1]];
-      cave[x-1][y+1] = tab_explode_normal[cave[x-1][y+1]];
-      cave[x+1][y+1] = tab_explode_normal[cave[x+1][y+1]];
+    case Zbug:
+      Lboom_bug_new(x, y, FALSE);
+      Lboom_nine(x, y, FALSE);
+      break;
+
+    case Ztank:
+      Lboom_tank_new(x, y, FALSE);
+      Lboom_nine(x, y, FALSE);
+      break;
+
+    case Zeater:
+      Lboom_eater_new(x, y, FALSE);
+      Lboom_nine(x, y, FALSE);
       break;
 
     case Zdynamite:
-      cave[x][y]     = Xboom_1;
-      cave[x][y-1]   = tab_explode_dynamite[cave[x][y-1]];
-      cave[x-1][y]   = tab_explode_dynamite[cave[x-1][y]];
-      cave[x+1][y]   = tab_explode_dynamite[cave[x+1][y]];
-      cave[x][y+1]   = tab_explode_dynamite[cave[x][y+1]];
-      cave[x-1][y-1] = tab_explode_dynamite[cave[x-1][y-1]];
-      cave[x+1][y-1] = tab_explode_dynamite[cave[x+1][y-1]];
-      cave[x-1][y+1] = tab_explode_dynamite[cave[x-1][y+1]];
-      cave[x+1][y+1] = tab_explode_dynamite[cave[x+1][y+1]];
+      Lboom_nine(x, y, TRUE);
+      break;
+
+    case Zboom:
+      Lboom_nine(x, y, FALSE);
       break;
   }
 }
@@ -6034,6 +7208,11 @@ static void Lboom_android(int x, int y)
   Lboom_1(x, y);
 }
 
+static void Lchain(int x, int y)
+{
+  next[x][y] = Zboom;
+}
+
 static void handle_tile(int x, int y)
 {
   switch (cave[x][y])
@@ -6047,7 +7226,6 @@ static void handle_tile(int x, int y)
     case Xacid_7:              Lacid_7(x, y);                  break;
     case Xacid_8:              Lacid_8(x, y);                  break;
 
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xfake_acid_1:         Lfake_acid_1(x, y);             break;
     case Xfake_acid_2:         Lfake_acid_2(x, y);             break;
     case Xfake_acid_3:         Lfake_acid_3(x, y);             break;
@@ -6056,7 +7234,6 @@ static void handle_tile(int x, int y)
     case Xfake_acid_6:         Lfake_acid_6(x, y);             break;
     case Xfake_acid_7:         Lfake_acid_7(x, y);             break;
     case Xfake_acid_8:         Lfake_acid_8(x, y);             break;
-#endif
 
     case Xandroid:             Landroid(x, y);                 break;
     case Xandroid_1_n:         Landroid_1_n(x, y);             break;
@@ -6182,13 +7359,11 @@ static void handle_tile(int x, int y)
     case Xsand_stonesand_4:    Lsand_stonesand_4(x, y);        break;
     case Xsand_stoneout_1:     Lsand_stoneout_1(x, y);         break;
     case Xsand_stoneout_2:     Lsand_stoneout_2(x, y);         break;
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xsand_stonesand_quickout_1: Lsand_stonesand_quickout_1(x, y); break;
     case Xsand_stonesand_quickout_2: Lsand_stonesand_quickout_2(x, y); break;
-#endif
 
-    case Xslidewall_ns:                Lslidewall_ns(x, y);            break;
-    case Xslidewall_ew:                Lslidewall_ew(x, y);            break;
+    case Xslide_ns:            Lslide_ns(x, y);                break;
+    case Xslide_ew:            Lslide_ew(x, y);                break;
 
     case Xexit:                        Lexit(x, y);                    break;
     case Xexit_1:              Lexit_1(x, y);                  break;
@@ -6197,15 +7372,16 @@ static void handle_tile(int x, int y)
 
     case Xpause:               Lpause(x, y);                   break;
 
-    case Xboom_bug:            Lboom_bug(x, y, Xboom_bug);     break;
-    case Xboom_bomb:           Lboom_tank(x, y, Xboom_bomb);   break;
+    case Xchain:               Lchain(x, y);                   break;
+    case Xboom_bug:            Lboom_bug(x, y);                break;
+    case Xboom_tank:           Lboom_tank(x, y);               break;
     case Xboom_android:                Lboom_android(x, y);            break;
     case Xboom_1:              Lboom_1(x, y);                  break;
     case Xboom_2:              Lboom_2(x, y);                  break;
   }
 }
 
-void logic_1(void)
+static void logic_players(void)
 {
   int start_check_nr;
   int i;
@@ -6228,12 +7404,27 @@ void logic_1(void)
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
-    ply[i].oldx = ply[i].x;
-    ply[i].oldy = ply[i].y;
+    if (!ply[i].alive)
+      continue;
+
+    /* check for wrap-around movement */
+    if (ply[i].x < lev.left ||
+       ply[i].x > lev.right - 1)
+    {
+      ply[i].x = (ply[i].x < lev.left ? lev.right - 1 : lev.left);
+
+      game.centered_player_nr_next = i;
+      game.set_centered_player = TRUE;
+      game.set_centered_player_wrap = TRUE;
+    }
+
+    ply[i].prev_x = ply[i].x;
+    ply[i].prev_y = ply[i].y;
     ply[i].anim = PLY_still;
   }
 
-  start_check_nr = (RandomEM & 128 ? 0 : 1) * 2 + (RandomEM & 256 ? 0 : 1);
+  start_check_nr = ((game_em.random & 128 ? 0 : 1) * 2 +
+                   (game_em.random & 256 ? 0 : 1));
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
@@ -6248,10 +7439,10 @@ void logic_1(void)
     if (!ply[i].alive)
       continue;
 
-    if (cave[ply[i].oldx][ply[i].oldy] == Zplayer)
+    if (cave[ply[i].prev_x][ply[i].prev_y] == Zplayer)
     {
-      cave[ply[i].oldx][ply[i].oldy] = Xblank;
-      next[ply[i].oldx][ply[i].oldy] = Xblank;
+      cave[ply[i].prev_x][ply[i].prev_y] = Xblank;
+      next[ply[i].prev_x][ply[i].prev_y] = Xblank;
     }
 
     if (cave[ply[i].x][ply[i].y] == Xblank)
@@ -6262,7 +7453,7 @@ void logic_1(void)
   }
 }
 
-void logic_2(void)
+static void logic_objects(void)
 {
   int x, y;
 
@@ -6270,7 +7461,7 @@ void logic_2(void)
   next = lev.next;
   boom = lev.boom;
 
-  seed = RandomEM;
+  seed = game_em.random;
   score = 0;
 
   for (y = lev.top; y < lev.bottom; y++)
@@ -6282,7 +7473,7 @@ void logic_2(void)
   else
     game_em.game_over = TRUE;
 
-  RandomEM = seed;
+  game_em.random = seed;
 
   /* triple buffering */
   void *temp = lev.cave;
@@ -6291,12 +7482,16 @@ void logic_2(void)
   lev.draw = temp;
 }
 
-void logic_3(void)
+static void logic_globals(void)
 {
   int x;
   int y;
   int count;
-  unsigned int random;
+#ifdef RANDOM_BUG
+  uint64_t random;
+#else
+  uint32_t random;
+#endif
 
   cave = lev.cave;
   next = lev.next;
@@ -6311,7 +7506,7 @@ void logic_3(void)
     lev.android_move_cnt = lev.android_move_time;
   if (lev.android_clone_cnt-- == 0)
     lev.android_clone_cnt = lev.android_clone_time;
-  if (lev.ball_state)
+  if (lev.ball_active)
     if (lev.ball_cnt-- == 0)
       lev.ball_cnt = lev.ball_time;
   if (lev.lenses_cnt)
@@ -6322,7 +7517,7 @@ void logic_3(void)
     lev.wheel_cnt--;
   if (lev.wind_cnt)
     lev.wind_cnt--;
-  if (lev.wonderwall_time && lev.wonderwall_state)
+  if (lev.wonderwall_time > 0 && lev.wonderwall_active)
     lev.wonderwall_time--;
 
   if (lev.wheel_cnt)
@@ -6330,21 +7525,26 @@ void logic_3(void)
 
   /* grow amoeba */
 
-  random = RandomEM;
+  random = game_em.random;
 
   for (count = lev.amoeba_time; count--;)
   {
-    x = lev.left - 1 + (random >> 10) % CAVE_WIDTH;
-    y = lev.top  - 1 + (random >> 20) % CAVE_HEIGHT;
+    x = lev.left - 1 + (random >> 10) % (CAVE_WIDTH  + 2);
+    y = lev.top  - 1 + (random >> 20) % (CAVE_HEIGHT + 2);
 
     if (x >= lev.left && x < lev.right &&
        y >= lev.top  && y < lev.bottom)
       Lamoeba(x, y);
 
     random = random * 129 + 1;
+
+#ifdef RANDOM_BUG
+    if (!game_em.use_random_bug)
+      random = (uint32_t)random;
+#endif
   }
 
-  RandomEM = random;
+  game_em.random = random;
 
   /* handle explosions */
 
@@ -6358,3 +7558,25 @@ void logic_3(void)
     for (x = lev.left; x < lev.right; x++)
       next[x][y] = cave[x][y];
 }
+
+void logic_init(void)
+{
+  int splash_is_blank = !game_em.use_old_android;
+
+  is_android_blank[Xsplash_e] = splash_is_blank;
+  is_android_blank[Xsplash_w] = splash_is_blank;
+}
+
+void logic(void)
+{
+  if (frame == 0)
+  {
+    logic_players();
+    logic_objects();
+  }
+
+  if (frame == 1)
+  {
+    logic_globals();
+  }
+}