X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Flogic.c;h=3c68bfb9f73ea6250de9abf3ef47b29ec65ad8a1;hb=6eaf8f1f31cd229a7315063f4434389d00aa5cff;hp=cc2eda1e3b0a843a05efe1905cfbbe0b06dbcb90;hpb=39e6654ab29b4ddea7a34616c5e72e69acf0b028;p=rocksndiamonds.git

diff --git a/src/game_em/logic.c b/src/game_em/logic.c
index cc2eda1e..3c68bfb9 100644
--- a/src/game_em/logic.c
+++ b/src/game_em/logic.c
@@ -9,15 +9,110 @@
 
 
 #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(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 +126,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 +165,86 @@ 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) % 8;
 
 #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 boolean player_killed(struct PLAYER *ply)
 {
   int x = ply->x;
@@ -171,6 +342,7 @@ static boolean player_killed(struct PLAYER *ply)
 
   switch (cave[x][y])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -182,7 +354,6 @@ static boolean player_killed(struct PLAYER *ply)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-    case Zplayer:
     case Xdynamite_1:
     case Xdynamite_2:
     case Xdynamite_3:
@@ -198,7 +369,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])
   {
@@ -211,6 +382,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:
@@ -221,7 +393,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;
   }
 
@@ -236,6 +409,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:
@@ -246,7 +420,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;
   }
 
@@ -261,6 +436,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:
@@ -271,7 +447,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;
   }
 
@@ -286,6 +463,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:
@@ -296,7 +474,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;
   }
 
@@ -317,7 +496,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:
@@ -351,7 +530,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];
 
@@ -363,6 +542,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xsplash_w:
 	cave[x][y] = Zplayer;
 	next[x][y] = Zplayer;
+	// FALL THROUGH
+
       case Xfake_acid_1:
       case Xfake_acid_2:
       case Xfake_acid_3:
@@ -377,7 +558,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	ply->y = y;
 	break;
 
-#ifdef USE_CHANGED_ACID_STUFF
       case Xacid_1:
       case Xacid_2:
       case Xacid_3:
@@ -386,13 +566,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] = Xsplash_e;
 	if (cave[x-1][y-1] == Xblank)
 	  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:
@@ -411,17 +592,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;
@@ -453,7 +623,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;
@@ -466,7 +636,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;
@@ -930,10 +1100,10 @@ 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;
 
-	if (!tab_fake_acid[cave[x+dx][y+dy]])
+	if (!is_fake_acid[cave[x+dx][y+dy]])
 	{
 	  cave[x+dx][y+dy] = Zplayer;
 	  next[x+dx][y+dy] = Zplayer;
@@ -986,7 +1156,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:
@@ -1044,7 +1214,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;
@@ -1055,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.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;
@@ -1140,6 +1310,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;
 }
 
@@ -1207,7 +1382,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;
     }
@@ -1215,7 +1393,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)
     {
@@ -1231,17 +1409,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;
 
@@ -1386,14 +1568,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))
@@ -1497,91 +1679,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;
     }
   }
@@ -1611,54 +1793,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;
       }
     }
@@ -1669,54 +1851,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;
       }
     }
@@ -2179,6 +2361,7 @@ static void Leater_n(int x, int y)
 
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -2192,7 +2375,6 @@ static void Leater_n(int x, int y)
     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;
@@ -2259,6 +2441,7 @@ static void Leater_e(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -2272,7 +2455,6 @@ static void Leater_e(int x, int y)
     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;
@@ -2339,6 +2521,7 @@ static void Leater_s(int x, int y)
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -2352,7 +2535,6 @@ static void Leater_s(int x, int y)
     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;
@@ -2419,6 +2601,7 @@ static void Leater_w(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -2432,7 +2615,6 @@ static void Leater_w(int x, int y)
     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;
@@ -2483,6 +2665,7 @@ static void Lalien(int x, int y)
     {
       switch (cave[x][y-1])
       {
+	case Zplayer:
 	case Xblank:
 	case Xsplash_e:
 	case Xsplash_w:
@@ -2496,7 +2679,6 @@ static void Lalien(int x, int y)
 	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;
@@ -2526,6 +2708,7 @@ static void Lalien(int x, int y)
     {
       switch (cave[x][y+1])
       {
+	case Zplayer:
 	case Xblank:
 	case Xsplash_e:
 	case Xsplash_w:
@@ -2539,7 +2722,6 @@ static void Lalien(int x, int y)
 	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;
@@ -2572,6 +2754,7 @@ static void Lalien(int x, int y)
     {
       switch (cave[x+1][y])
       {
+	case Zplayer:
 	case Xblank:
 	case Xsplash_e:
 	case Xsplash_w:
@@ -2585,7 +2768,6 @@ static void Lalien(int x, int y)
 	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;
@@ -2615,6 +2797,7 @@ static void Lalien(int x, int y)
     {
       switch (cave[x-1][y])
       {
+	case Zplayer:
 	case Xblank:
 	case Xsplash_e:
 	case Xsplash_w:
@@ -2628,7 +2811,6 @@ static void Lalien(int x, int y)
 	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;
@@ -2666,6 +2848,7 @@ static void Lbug_n(int x, int y)
 {
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -2679,7 +2862,6 @@ static void Lbug_n(int x, int y)
     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;
@@ -2714,18 +2896,20 @@ 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 Xsplash_e:
     case Xsplash_w:
@@ -2747,7 +2931,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);
@@ -2761,12 +2944,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;
   }
@@ -2778,6 +2962,7 @@ static void Lbug_e(int x, int y)
 {
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -2791,7 +2976,6 @@ static void Lbug_e(int x, int y)
     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;
@@ -2826,18 +3010,20 @@ 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 Xsplash_e:
     case Xsplash_w:
@@ -2859,7 +3045,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);
@@ -2873,12 +3058,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;
   }
@@ -2890,6 +3076,7 @@ static void Lbug_s(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -2903,7 +3090,6 @@ static void Lbug_s(int x, int y)
     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;
@@ -2938,18 +3124,20 @@ 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 Xsplash_e:
     case Xsplash_w:
@@ -2971,7 +3159,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);
@@ -2985,12 +3172,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;
   }
@@ -3002,6 +3190,7 @@ static void Lbug_w(int x, int y)
 {
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -3015,7 +3204,6 @@ static void Lbug_w(int x, int y)
     case Xfake_acid_8:
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ybug_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Ybug_w;
@@ -3050,18 +3238,20 @@ 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 Xsplash_e:
     case Xsplash_w:
@@ -3083,7 +3273,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);
@@ -3097,12 +3286,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;
   }
@@ -3114,6 +3304,7 @@ static void Ltank_n(int x, int y)
 {
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -3127,7 +3318,6 @@ static void Ltank_n(int x, int y)
     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;
@@ -3162,18 +3352,20 @@ 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 Xsplash_e:
     case Xsplash_w:
@@ -3195,7 +3387,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);
@@ -3209,12 +3400,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;
   }
@@ -3226,6 +3418,7 @@ static void Ltank_e(int x, int y)
 {
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -3239,7 +3432,6 @@ static void Ltank_e(int x, int y)
     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;
@@ -3274,18 +3466,20 @@ 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 Xsplash_e:
     case Xsplash_w:
@@ -3307,7 +3501,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);
@@ -3321,12 +3514,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;
   }
@@ -3338,6 +3532,7 @@ static void Ltank_s(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -3351,7 +3546,6 @@ static void Ltank_s(int x, int y)
     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;
@@ -3386,18 +3580,20 @@ 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 Xsplash_e:
     case Xsplash_w:
@@ -3419,7 +3615,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);
@@ -3433,12 +3628,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;
   }
@@ -3450,6 +3646,7 @@ static void Ltank_w(int x, int y)
 {
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -3463,7 +3660,6 @@ static void Ltank_w(int x, int y)
     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;
@@ -3498,18 +3694,20 @@ 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 Xsplash_e:
     case Xsplash_w:
@@ -3531,7 +3729,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);
@@ -3545,12 +3742,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;
   }
@@ -3596,10 +3794,6 @@ static void Lemerald(int x, int y)
       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:
@@ -3609,24 +3803,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 Xslide_ns:
-    case Xslide_ew:
-    case Xwonderwall:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -3635,12 +3825,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:
@@ -3649,43 +3844,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;
 	}
       }
@@ -3750,6 +3957,7 @@ static void Lemerald_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -3761,7 +3969,6 @@ static void Lemerald_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-    case Zplayer:
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yemerald_s;
@@ -3786,17 +3993,16 @@ static void Lemerald_fall(int x, int y)
       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;
       }
@@ -3847,10 +4053,6 @@ static void Ldiamond(int x, int y)
       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:
@@ -3860,24 +4062,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 Xslide_ns:
-    case Xslide_ew:
-    case Xwonderwall:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -3886,12 +4084,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:
@@ -3900,43 +4103,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;
 	}
       }
@@ -4001,6 +4216,7 @@ static void Ldiamond_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -4012,7 +4228,6 @@ static void Ldiamond_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-    case Zplayer:
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ydiamond_s;
@@ -4037,17 +4252,16 @@ static void Ldiamond_fall(int x, int y)
       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;
       }
@@ -4107,10 +4321,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:
@@ -4120,23 +4330,20 @@ 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 Xslide_ns:
-    case Xslide_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -4145,51 +4352,67 @@ static void Lstone(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 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;
 	}
       }
@@ -4245,6 +4468,7 @@ static void Lstone_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -4256,7 +4480,6 @@ static void Lstone_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-    case Zplayer:
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ystone_s;
@@ -4280,26 +4503,41 @@ static void Lstone_fall(int x, int y)
       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 Xbug_1_n:
-    case Xbug_1_e:
-    case Xbug_1_s:
-    case Xbug_1_w:
-    case Xbug_2_n:
-    case Xbug_2_e:
+    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:
+    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] = 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;
 
@@ -4312,11 +4550,101 @@ 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 Xdiamond:
+    case Xdiamond_pause:
+      switch (cave[x][y+2])
+      {
+	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:
+	case Xbug_1_w:
+	case Xbug_2_n:
+	case Xbug_2_e:
+	case Xbug_2_s:
+	case Xbug_2_w:
+	case Xtank_1_n:
+	case Xtank_1_e:
+	case Xtank_1_s:
+	case Xtank_1_w:
+	case Xtank_2_n:
+	case Xtank_2_e:
+	case Xtank_2_s:
+	case Xtank_2_w:
+	case Xemerald_fall:
+	case Xdiamond_fall:
+	case Xstone_fall:
+	case Xbomb_fall:
+	case Xnut_fall:
+	case Xspring_fall:
+	case Xacid_s:
+	  next[x][y] = Xstone;
+	  play_element_sound(x, y, SOUND_stone, Xstone);
+	  return;
+      }
+
+      cave[x][y] = Ystone_sB;
+      next[x][y] = Xblank;
+      cave[x][y+1] = Ydiamond_stone;
+      next[x][y+1] = Xstone_pause;
+      play_element_sound(x, y, SOUND_squash, Xdiamond);
+      return;
+
+    case Xbomb:
+    case Xbomb_pause:
+      Lboom_cave_new(x, y, Xstone);
+      Lboom_next_new(x, y, Xstone);
+      cave[x][y+1] = Ybomb_blank;
+      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))
       {
@@ -4371,113 +4699,17 @@ static void Lstone_fall(int x, int y)
       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 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 Zplayer:
-	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:
-	case Xtank_1_n:
-	case Xtank_1_e:
-	case Xtank_1_s:
-	case Xtank_1_w:
-	case Xtank_2_n:
-	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 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:
-	  next[x][y] = Xstone;
-	  play_element_sound(x, y, SOUND_stone, Xstone);
-	  return;
-      }
-
-      cave[x][y] = Ystone_sB;
-      next[x][y] = Xblank;
-      cave[x][y+1] = Ydiamond_stone;
-      next[x][y+1] = Xstone_pause;
-      play_element_sound(x, y, SOUND_squash, Xdiamond);
-      return;
-
-    case Xbomb:
-    case Xbomb_pause:
-      cave[x][y+1] = Ybomb_blank;
-      Lboom_tank(x, y+1, Xstone_fall);
-      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;
       }
@@ -4528,10 +4760,6 @@ static void Lbomb(int x, int y)
       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:
@@ -4541,23 +4769,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 Xslide_ns:
-    case Xslide_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -4566,49 +4791,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;
 	}
       }
@@ -4700,7 +4941,8 @@ static void Lbomb_fall(int x, int y)
 
     default:
       cave[x][y] = Ybomb_blank;
-      Lboom_tank(x, y, Xbomb_fall);
+      next[x][y] = Ztank;
+      Lboom_tank_old(x, y);
       return;
   }
 }
@@ -4743,10 +4985,6 @@ static void Lnut(int x, int y)
       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:
@@ -4756,23 +4994,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 Xslide_ns:
-    case Xslide_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -4781,49 +5016,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;
 	}
       }
@@ -4879,6 +5130,7 @@ static void Lnut_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -4890,7 +5142,6 @@ static void Lnut_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-    case Zplayer:
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ynut_s;
@@ -4962,10 +5213,6 @@ static void Lspring(int x, int y)
       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:
@@ -4975,23 +5222,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 Xslide_ns:
-    case Xslide_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -5000,77 +5244,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;
 	}
       }
@@ -5161,7 +5409,7 @@ static void Lspring_e(int x, int y)
       return;
 
     case Xbumper:
-      cave[x][y+1] = XbumperB;
+      cave[x][y+1] = Ybumper;
   }
 
   switch (cave[x+1][y])
@@ -5219,8 +5467,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;
@@ -5272,7 +5520,7 @@ static void Lspring_w(int x, int y)
       return;
 
     case Xbumper:
-      cave[x][y+1] = XbumperB;
+      cave[x][y+1] = Ybumper;
   }
 
   switch (cave[x-1][y])
@@ -5330,8 +5578,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;
@@ -5348,6 +5596,7 @@ static void Lspring_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -5359,7 +5608,6 @@ static void Lspring_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-    case Zplayer:
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -5383,10 +5631,26 @@ static void Lspring_fall(int x, int y)
       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:
@@ -5398,8 +5662,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;
 
@@ -5412,27 +5678,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:
@@ -5445,302 +5704,506 @@ 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 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;
       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 (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 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;
       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 (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 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;
       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 (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 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;
       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 (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 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;
       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 (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 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;
       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 (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 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;
       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 (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 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;
       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 (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 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;
       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 (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 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;
       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 (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 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;
       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 (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 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;
       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 (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)
@@ -5992,7 +6455,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];
@@ -6001,7 +6464,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];
@@ -6010,7 +6473,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];
@@ -6019,7 +6482,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];
@@ -6028,7 +6491,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];
@@ -6037,7 +6500,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];
@@ -6046,7 +6509,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];
@@ -6055,7 +6518,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];
@@ -6066,56 +6529,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];
@@ -6127,7 +6590,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;
@@ -6140,7 +6603,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;
@@ -6162,6 +6625,7 @@ static void Ldrip_fall(int x, int y)
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
     case Xsplash_e:
     case Xsplash_w:
@@ -6175,7 +6639,6 @@ static void Ldrip_fall(int x, int y)
     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;
@@ -6233,9 +6696,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);
   }
 }
@@ -6243,31 +6706,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)
@@ -6399,14 +6862,14 @@ static void Lsand_stonesand_quickout_2(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] = 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] = Yslide_ns_blank;
     next[x][y+1] = Xslide_ns;
@@ -6416,14 +6879,14 @@ static void Lslide_ns(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] = 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] = Yslide_ew_blank;
     next[x-1][y] = Xslide_ew;
@@ -6433,7 +6896,7 @@ static void Lslide_ew(int x, int y)
 
 static void Lexit(int x, int y)
 {
-  if (lev.required > 0)
+  if (lev.gems_needed > 0)
     return;
 
   switch (RANDOM(64) / 21)
@@ -6492,45 +6955,147 @@ static void Lamoeba(int x, int y)
     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;
   }
 }
@@ -6560,6 +7125,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])
@@ -6719,15 +7289,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_players(void)
+static void logic_players(void)
 {
   int start_check_nr;
   int i;
@@ -6750,6 +7321,9 @@ void logic_players(void)
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
+    if (!ply[i].alive)
+      continue;
+
     /* check for wrap-around movement */
     if (ply[i].x < lev.left ||
 	ply[i].x > lev.right - 1)
@@ -6758,15 +7332,16 @@ void logic_players(void)
 
       game.centered_player_nr_next = i;
       game.set_centered_player = TRUE;
-      game.set_centered_player_fast = TRUE;
+      game.set_centered_player_wrap = TRUE;
     }
 
-    ply[i].oldx = ply[i].x;
-    ply[i].oldy = ply[i].y;
+    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++)
   {
@@ -6781,10 +7356,10 @@ void logic_players(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)
@@ -6795,7 +7370,7 @@ void logic_players(void)
   }
 }
 
-void logic_objects(void)
+static void logic_objects(void)
 {
   int x, y;
 
@@ -6803,7 +7378,7 @@ void logic_objects(void)
   next = lev.next;
   boom = lev.boom;
 
-  seed = RandomEM;
+  seed = game_em.random;
   score = 0;
 
   for (y = lev.top; y < lev.bottom; y++)
@@ -6815,7 +7390,7 @@ void logic_objects(void)
   else
     game_em.game_over = TRUE;
 
-  RandomEM = seed;
+  game_em.random = seed;
 
   /* triple buffering */
   void *temp = lev.cave;
@@ -6824,7 +7399,7 @@ void logic_objects(void)
   lev.draw = temp;
 }
 
-void logic_globals(void)
+static void logic_globals(void)
 {
   int x;
   int y;
@@ -6844,7 +7419,7 @@ void logic_globals(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)
@@ -6855,7 +7430,7 @@ void logic_globals(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)
@@ -6863,7 +7438,7 @@ void logic_globals(void)
 
   /* grow amoeba */
 
-  random = RandomEM;
+  random = game_em.random;
 
   for (count = lev.amoeba_time; count--;)
   {
@@ -6877,7 +7452,7 @@ void logic_globals(void)
     random = random * 129 + 1;
   }
 
-  RandomEM = random;
+  game_em.random = random;
 
   /* handle explosions */
 
@@ -6891,3 +7466,25 @@ void logic_globals(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();
+  }
+}