X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Flogic.c;h=ffb4d8765a381c691296566aea3396d70d83e5b9;hb=9e54f3f605e0999f4f2d866107449c247493e957;hp=2c5f74b347b2878fb7294b656a50f91ec5815f2c;hpb=c734235e0757e54dfdf6645d07a76c2a0bc591ba;p=rocksndiamonds.git

diff --git a/src/game_em/logic.c b/src/game_em/logic.c
index 2c5f74b3..ffb4d876 100644
--- a/src/game_em/logic.c
+++ b/src/game_em/logic.c
@@ -9,6 +9,8 @@
 
 
 #define SPRING_ROLL	/* spring rolling off round things continues to roll */
+#define ACID_ROLL	/* rolling objects go into acid rather than remove it */
+
 #define USE_CHANGED_ACID_STUFF
 
 #define RANDOM_RAW	(seed = seed << 31 | seed >> 1)
@@ -18,6 +20,86 @@ static short **cave, **next, **boom;
 static unsigned int seed;
 static int score;
 
+static const byte is_blank[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[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[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[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 const byte is_android_walkable[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;
@@ -33,7 +115,7 @@ static void Lboom_generic(int x, int y, int element, int element_middle)
 
 static void Lboom_bug(int x, int y, int by_element)
 {
-  next[x][y] = Znormal;
+  next[x][y] = Zbug;
 
   Lboom_generic(x, y, Xemerald, Xdiamond);
 
@@ -44,7 +126,7 @@ static void Lboom_bug(int x, int y, int by_element)
 
 static void Lboom_tank(int x, int y, int by_element)
 {
-  next[x][y] = Znormal;
+  next[x][y] = Ztank;
 
   Lboom_generic(x, y, Xblank, Xblank);
 
@@ -55,7 +137,7 @@ static void Lboom_tank(int x, int y, int by_element)
 
 static void Lboom_eater(int x, int y, int by_element)
 {
-  next[x][y] = Znormal;
+  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];
@@ -171,10 +253,10 @@ static boolean player_killed(struct PLAYER *ply)
 
   switch (cave[x][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -183,8 +265,6 @@ static boolean player_killed(struct PLAYER *ply)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
-    case Zplayer:
     case Xdynamite_1:
     case Xdynamite_2:
     case Xdynamite_3:
@@ -223,7 +303,7 @@ 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;
       break;
   }
 
@@ -248,7 +328,7 @@ 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;
       break;
   }
 
@@ -273,7 +353,7 @@ 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;
       break;
   }
 
@@ -298,7 +378,7 @@ 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;
       break;
   }
 
@@ -361,11 +441,10 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
     {
       /* fire is released */
       case Xblank:
-      case Xacid_splash_e:
-      case Xacid_splash_w:
+      case Xsplash_e:
+      case Xsplash_w:
 	cave[x][y] = Zplayer;
 	next[x][y] = Zplayer;
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
       case Xfake_acid_1:
       case Xfake_acid_2:
       case Xfake_acid_3:
@@ -374,7 +453,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xfake_acid_6:
       case Xfake_acid_7:
       case Xfake_acid_8:
-#endif
 	play_element_sound(x, y, SOUND_blank, Xblank);
 	ply->anim = PLY_walk_n + anim;
 	ply->x = x;
@@ -391,9 +469,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xacid_7:
       case Xacid_8:
 	if (cave[x+1][y-1] == Xblank)
-	  cave[x+1][y-1] = Xacid_splash_e;
+	  cave[x+1][y-1] = Xsplash_e;
 	if (cave[x-1][y-1] == Xblank)
-	  cave[x-1][y-1] = Xacid_splash_w;
+	  cave[x-1][y-1] = Xsplash_w;
 	play_element_sound(x, y, SOUND_acid, Xacid_1);
 #endif
 
@@ -457,7 +535,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	next[x][y] = Zplayer;
 	play_element_sound(x, y, SOUND_collect, element);
 	lev.score += lev.diamond_score;
-	lev.required = lev.required < 3 ? 0 : lev.required - 3;
+	lev.gems_needed = lev.gems_needed < 3 ? 0 : lev.gems_needed - 3;
 	game.snapshot.collected_item = TRUE;
 	ply->anim = PLY_walk_n + anim;
 	ply->x = x;
@@ -470,7 +548,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	next[x][y] = Zplayer;
 	play_element_sound(x, y, SOUND_collect, element);
 	lev.score += lev.emerald_score;
-	lev.required = lev.required < 1 ? 0 : lev.required - 1;
+	lev.gems_needed = lev.gems_needed < 1 ? 0 : lev.gems_needed - 1;
 	game.snapshot.collected_item = TRUE;
 	ply->anim = PLY_walk_n + anim;
 	ply->x = x;
@@ -567,9 +645,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	switch (cave[x+dx][y])
 	{
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+          case Xsplash_e:
+          case Xsplash_w:
 	  case Xfake_acid_1:
 	  case Xfake_acid_2:
 	  case Xfake_acid_3:
@@ -578,7 +655,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	  case Xfake_acid_6:
 	  case Xfake_acid_7:
 	  case Xfake_acid_8:
-#endif
 	    cave[x+dx][y] = dx > 0 ? Ystone_e : Ystone_w;
 	    next[x+dx][y] = Xstone_pause;
 	    goto stone_walk;
@@ -592,9 +668,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
 	    if (cave[x+dx+1][y-1] == Xblank)
-	      cave[x+dx+1][y-1] = Xacid_splash_e;
+	      cave[x+dx+1][y-1] = Xsplash_e;
 	    if (cave[x+dx-1][y-1] == Xblank)
-	      cave[x+dx-1][y-1] = Xacid_splash_w;
+	      cave[x+dx-1][y-1] = Xsplash_w;
 	    play_element_sound(x, y, SOUND_acid, Xacid_1);
 
           stone_walk:
@@ -616,9 +692,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	switch (cave[x+dx][y])
 	{
 	  case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+          case Xsplash_e:
+          case Xsplash_w:
 	  case Xfake_acid_1:
 	  case Xfake_acid_2:
 	  case Xfake_acid_3:
@@ -627,7 +702,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	  case Xfake_acid_6:
 	  case Xfake_acid_7:
 	  case Xfake_acid_8:
-#endif
 	    cave[x+dx][y] = dx > 0 ? Ybomb_e : Ybomb_w;
 	    next[x+dx][y] = Xbomb_pause;
 	    goto bomb_walk;
@@ -641,9 +715,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
 	    if (cave[x+dx+1][y-1] == Xblank)
-	      cave[x+dx+1][y-1] = Xacid_splash_e;
+	      cave[x+dx+1][y-1] = Xsplash_e;
 	    if (cave[x+dx-1][y-1] == Xblank)
-	      cave[x+dx-1][y-1] = Xacid_splash_w;
+	      cave[x+dx-1][y-1] = Xsplash_w;
 	    play_element_sound(x, y, SOUND_acid, Xacid_1);
 
           bomb_walk:
@@ -665,9 +739,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	switch (cave[x+dx][y])
 	{
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+          case Xsplash_e:
+          case Xsplash_w:
 	  case Xfake_acid_1:
 	  case Xfake_acid_2:
 	  case Xfake_acid_3:
@@ -676,7 +749,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	  case Xfake_acid_6:
 	  case Xfake_acid_7:
 	  case Xfake_acid_8:
-#endif
 	    cave[x+dx][y] = dx > 0 ? Ynut_e : Ynut_w;
 	    next[x+dx][y] = Xnut_pause;
 	    goto nut_walk;
@@ -690,9 +762,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
 	    if (cave[x+dx+1][y-1] == Xblank)
-	      cave[x+dx+1][y-1] = Xacid_splash_e;
+	      cave[x+dx+1][y-1] = Xsplash_e;
 	    if (cave[x+dx-1][y-1] == Xblank)
-	      cave[x+dx-1][y-1] = Xacid_splash_w;
+	      cave[x+dx-1][y-1] = Xsplash_w;
 	    play_element_sound(x, y, SOUND_acid, Xacid_1);
 
           nut_walk:
@@ -714,9 +786,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	switch (cave[x+dx][y])
 	{
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+          case Xsplash_e:
+          case Xsplash_w:
 	  case Xfake_acid_1:
 	  case Xfake_acid_2:
 	  case Xfake_acid_3:
@@ -725,7 +796,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	  case Xfake_acid_6:
 	  case Xfake_acid_7:
 	  case Xfake_acid_8:
-#endif
 	    cave[x+dx][y] = dx > 0 ? Yspring_e : Yspring_w;
 	    next[x+dx][y] = dx > 0 ? Xspring_e : Xspring_w;
 	    goto spring_walk;
@@ -739,9 +809,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
 	    if (cave[x+dx+1][y-1] == Xblank)
-	      cave[x+dx+1][y-1] = Xacid_splash_e;
+	      cave[x+dx+1][y-1] = Xsplash_e;
 	    if (cave[x+dx-1][y-1] == Xblank)
-	      cave[x+dx-1][y-1] = Xacid_splash_w;
+	      cave[x+dx-1][y-1] = Xsplash_w;
 	    play_element_sound(x, y, SOUND_acid, Xacid_1);
 
 	  spring_walk:
@@ -785,9 +855,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	switch (cave[x+dx][y+dy])
 	{
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+          case Xsplash_e:
+          case Xsplash_w:
 	  case Xfake_acid_1:
 	  case Xfake_acid_2:
 	  case Xfake_acid_3:
@@ -796,7 +865,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	  case Xfake_acid_6:
 	  case Xfake_acid_7:
 	  case Xfake_acid_8:
-#endif
 	    cave[x+dx][y+dy] = (dy ? (dy < 0 ? Yballoon_n : Yballoon_s) :
 				(dx > 0 ? Yballoon_e : Yballoon_w));
 	    next[x+dx][y+dy] = Xballoon;
@@ -811,9 +879,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
 	    if (cave[x+dx+1][y+dy-1] == Xblank)
-	      cave[x+dx+1][y+dy-1] = Xacid_splash_e;
+	      cave[x+dx+1][y+dy-1] = Xsplash_e;
 	    if (cave[x+dx-1][y+dy-1] == Xblank)
-	      cave[x+dx-1][y+dy-1] = Xacid_splash_w;
+	      cave[x+dx-1][y+dy-1] = Xsplash_w;
 	    play_element_sound(x, y, SOUND_acid, Xacid_1);
 
 	  balloon_walk:
@@ -842,9 +910,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	switch (cave[x+dx][y+dy])
 	{
           case Xblank:
-          case Xacid_splash_e:
-          case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+          case Xsplash_e:
+          case Xsplash_w:
 	  case Xfake_acid_1:
 	  case Xfake_acid_2:
 	  case Xfake_acid_3:
@@ -853,7 +920,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	  case Xfake_acid_6:
 	  case Xfake_acid_7:
 	  case Xfake_acid_8:
-#endif
 	    cave[x+dx][y+dy] = (dy ? (dy < 0 ? Yandroid_n : Yandroid_s) :
 				(dx > 0 ? Yandroid_e : Yandroid_w));
 	    next[x+dx][y+dy] = (dy ? (dy < 0 ? Xandroid_2_n : Xandroid_2_s) :
@@ -869,9 +935,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
           case Xacid_7:
           case Xacid_8:
 	    if (cave[x+dx+1][y+dy-1] == Xblank)
-	      cave[x+dx+1][y+dy-1] = Xacid_splash_e;
+	      cave[x+dx+1][y+dy-1] = Xsplash_e;
 	    if (cave[x+dx-1][y+dy-1] == Xblank)
-	      cave[x+dx-1][y+dy-1] = Xacid_splash_w;
+	      cave[x+dx-1][y+dy-1] = Xsplash_w;
 	    play_element_sound(x, y, SOUND_acid, Xacid_1);
 
 	  android_walk:
@@ -946,10 +1012,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;
@@ -1060,7 +1126,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;
@@ -1071,7 +1137,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;
@@ -1247,7 +1313,8 @@ 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;
   }
@@ -1356,7 +1423,6 @@ static void Lacid_8(int x, int y)
   next[x][y] = Xacid_1;
 }
 
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
 static void Lfake_acid_1(int x, int y)
 {
   next[x][y] = Xfake_acid_2;
@@ -1396,7 +1462,6 @@ static void Lfake_acid_8(int x, int y)
 {
   next[x][y] = Xfake_acid_1;
 }
-#endif
 
 static void Landroid(int x, int y)
 {
@@ -1404,14 +1469,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_blank[cave[x-1][y-1]] &&
+	!is_blank[cave[x][y-1]]   &&
+	!is_blank[cave[x+1][y-1]] &&
+	!is_blank[cave[x-1][y]]   &&
+	!is_blank[cave[x+1][y]]   &&
+	!is_blank[cave[x-1][y+1]] &&
+	!is_blank[cave[x][y+1]]   &&
+	!is_blank[cave[x+1][y+1]])
       goto android_move;
 
     switch (RANDOM(8))
@@ -1515,91 +1580,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_blank[cave[x][y+1]])   goto android_s;
+	if (is_blank[cave[x+1][y-1]]) goto android_ne;
+	if (is_blank[cave[x-1][y]])   goto android_w;
+	if (is_blank[cave[x-1][y-1]]) goto android_nw;
+	if (is_blank[cave[x+1][y+1]]) goto android_se;
+	if (is_blank[cave[x+1][y]])   goto android_e;
+	if (is_blank[cave[x-1][y+1]]) goto android_sw;
+	if (is_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_blank[cave[x-1][y-1]]) goto android_nw;
+	if (is_blank[cave[x+1][y+1]]) goto android_se;
+	if (is_blank[cave[x][y-1]])   goto android_n;
+	if (is_blank[cave[x][y+1]])   goto android_s;
+	if (is_blank[cave[x+1][y-1]]) goto android_ne;
+	if (is_blank[cave[x-1][y+1]]) goto android_sw;
+	if (is_blank[cave[x+1][y]])   goto android_e;
+	if (is_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_blank[cave[x-1][y+1]]) goto android_sw;
+	if (is_blank[cave[x+1][y]])   goto android_e;
+	if (is_blank[cave[x][y+1]])   goto android_s;
+	if (is_blank[cave[x-1][y]])   goto android_w;
+	if (is_blank[cave[x][y-1]])   goto android_n;
+	if (is_blank[cave[x-1][y-1]]) goto android_nw;
+	if (is_blank[cave[x+1][y+1]]) goto android_se;
+	if (is_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_blank[cave[x][y-1]])   goto android_n;
+	if (is_blank[cave[x+1][y+1]]) goto android_se;
+	if (is_blank[cave[x+1][y-1]]) goto android_ne;
+	if (is_blank[cave[x+1][y]])   goto android_e;
+	if (is_blank[cave[x-1][y]])   goto android_w;
+	if (is_blank[cave[x][y+1]])   goto android_s;
+	if (is_blank[cave[x-1][y-1]]) goto android_nw;
+	if (is_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_blank[cave[x+1][y+1]]) goto android_se;
+	if (is_blank[cave[x-1][y-1]]) goto android_nw;
+	if (is_blank[cave[x+1][y]])   goto android_e;
+	if (is_blank[cave[x+1][y-1]]) goto android_ne;
+	if (is_blank[cave[x-1][y+1]]) goto android_sw;
+	if (is_blank[cave[x-1][y]])   goto android_w;
+	if (is_blank[cave[x][y-1]])   goto android_n;
+	if (is_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_blank[cave[x+1][y-1]]) goto android_ne;
+	if (is_blank[cave[x-1][y]])   goto android_w;
+	if (is_blank[cave[x+1][y+1]]) goto android_se;
+	if (is_blank[cave[x-1][y+1]]) goto android_sw;
+	if (is_blank[cave[x][y+1]])   goto android_s;
+	if (is_blank[cave[x][y-1]])   goto android_n;
+	if (is_blank[cave[x+1][y]])   goto android_e;
+	if (is_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_blank[cave[x+1][y]])   goto android_e;
+	if (is_blank[cave[x][y-1]])   goto android_n;
+	if (is_blank[cave[x-1][y+1]]) goto android_sw;
+	if (is_blank[cave[x][y+1]])   goto android_s;
+	if (is_blank[cave[x-1][y-1]]) goto android_nw;
+	if (is_blank[cave[x+1][y-1]]) goto android_ne;
+	if (is_blank[cave[x+1][y+1]]) goto android_se;
+	if (is_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_blank[cave[x-1][y]])   goto android_w;
+	if (is_blank[cave[x-1][y+1]]) goto android_sw;
+	if (is_blank[cave[x-1][y-1]]) goto android_nw;
+	if (is_blank[cave[x][y-1]])   goto android_n;
+	if (is_blank[cave[x+1][y]])   goto android_e;
+	if (is_blank[cave[x+1][y+1]]) goto android_se;
+	if (is_blank[cave[x+1][y-1]]) goto android_ne;
+	if (is_blank[cave[x][y+1]])   goto android_s;
 	goto android_move;
     }
   }
@@ -1629,54 +1694,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;
       }
     }
@@ -1687,54 +1752,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;
       }
     }
@@ -1806,9 +1871,8 @@ static void Landroid_1_n(int x, int y)
   switch (cave[x][y-1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -1817,7 +1881,6 @@ static void Landroid_1_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yandroid_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Yandroid_n;
@@ -1836,9 +1899,9 @@ static void Landroid_1_n(int x, int y)
       cave[x][y] = Yandroid_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-	cave[x+1][y-2] = Xacid_splash_e;
+	cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-	cave[x-1][y-2] = Xacid_splash_w;
+	cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1853,9 +1916,8 @@ static void Landroid_2_n(int x, int y)
   switch (cave[x][y-1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -1864,7 +1926,6 @@ static void Landroid_2_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yandroid_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Yandroid_n;
@@ -1883,9 +1944,9 @@ static void Landroid_2_n(int x, int y)
       cave[x][y] = Yandroid_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-	cave[x+1][y-2] = Xacid_splash_e;
+	cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-	cave[x-1][y-2] = Xacid_splash_w;
+	cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1900,9 +1961,8 @@ static void Landroid_1_e(int x, int y)
   switch (cave[x+1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -1911,7 +1971,6 @@ static void Landroid_1_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yandroid_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Yandroid_e;
@@ -1930,9 +1989,9 @@ static void Landroid_1_e(int x, int y)
       cave[x][y] = Yandroid_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-	cave[x+2][y-1] = Xacid_splash_e;
+	cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_w;
+	cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1947,9 +2006,8 @@ static void Landroid_2_e(int x, int y)
   switch (cave[x+1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -1958,7 +2016,6 @@ static void Landroid_2_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yandroid_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Yandroid_e;
@@ -1977,9 +2034,9 @@ static void Landroid_2_e(int x, int y)
       cave[x][y] = Yandroid_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-	cave[x+2][y-1] = Xacid_splash_e;
+	cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_w;
+	cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -1994,9 +2051,8 @@ static void Landroid_1_s(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2005,7 +2061,6 @@ static void Landroid_1_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yandroid_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yandroid_s;
@@ -2024,9 +2079,9 @@ static void Landroid_1_s(int x, int y)
       cave[x][y] = Yandroid_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2041,9 +2096,8 @@ static void Landroid_2_s(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2052,7 +2106,6 @@ static void Landroid_2_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yandroid_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yandroid_s;
@@ -2071,9 +2124,9 @@ static void Landroid_2_s(int x, int y)
       cave[x][y] = Yandroid_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2088,9 +2141,8 @@ static void Landroid_1_w(int x, int y)
   switch (cave[x-1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2099,7 +2151,6 @@ static void Landroid_1_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yandroid_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Yandroid_w;
@@ -2118,9 +2169,9 @@ static void Landroid_1_w(int x, int y)
       cave[x][y] = Yandroid_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_e;
+	cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-	cave[x-2][y-1] = Xacid_splash_w;
+	cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2135,9 +2186,8 @@ static void Landroid_2_w(int x, int y)
   switch (cave[x-1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2146,7 +2196,6 @@ static void Landroid_2_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yandroid_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Yandroid_w;
@@ -2165,9 +2214,9 @@ static void Landroid_2_w(int x, int y)
       cave[x][y] = Yandroid_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_e;
+	cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-	cave[x-2][y-1] = Xacid_splash_w;
+	cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2213,10 +2262,10 @@ static void Leater_n(int x, int y)
 
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2225,10 +2274,8 @@ static void Leater_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Yeater_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Yeater_n;
@@ -2246,9 +2293,9 @@ static void Leater_n(int x, int y)
       cave[x][y] = Yeater_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-	cave[x+1][y-2] = Xacid_splash_e;
+	cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-	cave[x-1][y-2] = Xacid_splash_w;
+	cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2295,10 +2342,10 @@ static void Leater_e(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2307,10 +2354,8 @@ static void Leater_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Yeater_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Yeater_e;
@@ -2328,9 +2373,9 @@ static void Leater_e(int x, int y)
       cave[x][y] = Yeater_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-	cave[x+2][y-1] = Xacid_splash_e;
+	cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_w;
+	cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2377,10 +2422,10 @@ static void Leater_s(int x, int y)
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2389,10 +2434,8 @@ static void Leater_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Yeater_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yeater_s;
@@ -2410,9 +2453,9 @@ static void Leater_s(int x, int y)
       cave[x][y] = Yeater_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2459,10 +2502,10 @@ static void Leater_w(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2471,10 +2514,8 @@ static void Leater_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Yeater_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Yeater_w;
@@ -2492,9 +2533,9 @@ static void Leater_w(int x, int y)
       cave[x][y] = Yeater_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_e;
+	cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-	cave[x-2][y-1] = Xacid_splash_w;
+	cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2525,10 +2566,10 @@ static void Lalien(int x, int y)
     {
       switch (cave[x][y-1])
       {
+	case Zplayer:
 	case Xblank:
-	case Xacid_splash_e:
-	case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+	case Xsplash_e:
+	case Xsplash_w:
 	case Xfake_acid_1:
 	case Xfake_acid_2:
 	case Xfake_acid_3:
@@ -2537,10 +2578,8 @@ static void Lalien(int x, int y)
 	case Xfake_acid_6:
 	case Xfake_acid_7:
 	case Xfake_acid_8:
-#endif
 	case Xplant:
 	case Yplant:
-	case Zplayer:
 	  cave[x][y] = Yalien_nB;
 	  next[x][y] = Xblank;
 	  cave[x][y-1] = Yalien_n;
@@ -2559,9 +2598,9 @@ static void Lalien(int x, int y)
 	  cave[x][y] = Yalien_nB;
 	  next[x][y] = Xblank;
 	  if (cave[x+1][y-2] == Xblank)
-	    cave[x+1][y-2] = Xacid_splash_e;
+	    cave[x+1][y-2] = Xsplash_e;
 	  if (cave[x-1][y-2] == Xblank)
-	    cave[x-1][y-2] = Xacid_splash_w;
+	    cave[x-1][y-2] = Xsplash_w;
 	  play_element_sound(x, y, SOUND_acid, Xacid_1);
 	  return;
       }
@@ -2570,10 +2609,10 @@ static void Lalien(int x, int y)
     {
       switch (cave[x][y+1])
       {
+	case Zplayer:
 	case Xblank:
-	case Xacid_splash_e:
-	case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+	case Xsplash_e:
+	case Xsplash_w:
 	case Xfake_acid_1:
 	case Xfake_acid_2:
 	case Xfake_acid_3:
@@ -2582,10 +2621,8 @@ static void Lalien(int x, int y)
 	case Xfake_acid_6:
 	case Xfake_acid_7:
 	case Xfake_acid_8:
-#endif
 	case Xplant:
 	case Yplant:
-	case Zplayer:
 	  cave[x][y] = Yalien_sB;
 	  next[x][y] = Xblank;
 	  cave[x][y+1] = Yalien_s;
@@ -2604,9 +2641,9 @@ static void Lalien(int x, int y)
 	  cave[x][y] = Yalien_sB;
 	  next[x][y] = Xblank;
 	  if (cave[x+1][y] == Xblank)
-	    cave[x+1][y] = Xacid_splash_e;
+	    cave[x+1][y] = Xsplash_e;
 	  if (cave[x-1][y] == Xblank)
-	    cave[x-1][y] = Xacid_splash_w;
+	    cave[x-1][y] = Xsplash_w;
 	  play_element_sound(x, y, SOUND_acid, Xacid_1);
 	  return;
       }
@@ -2618,10 +2655,10 @@ static void Lalien(int x, int y)
     {
       switch (cave[x+1][y])
       {
+	case Zplayer:
 	case Xblank:
-	case Xacid_splash_e:
-	case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+	case Xsplash_e:
+	case Xsplash_w:
 	case Xfake_acid_1:
 	case Xfake_acid_2:
 	case Xfake_acid_3:
@@ -2630,10 +2667,8 @@ static void Lalien(int x, int y)
 	case Xfake_acid_6:
 	case Xfake_acid_7:
 	case Xfake_acid_8:
-#endif
 	case Xplant:
 	case Yplant:
-	case Zplayer:
 	  cave[x][y] = Yalien_eB;
 	  next[x][y] = Xblank;
 	  cave[x+1][y] = Yalien_e;
@@ -2652,9 +2687,9 @@ static void Lalien(int x, int y)
 	  cave[x][y] = Yalien_eB;
 	  next[x][y] = Xblank;
 	  if (cave[x+2][y-1] == Xblank)
-	    cave[x+2][y-1] = Xacid_splash_e;
+	    cave[x+2][y-1] = Xsplash_e;
 	  if (cave[x][y-1] == Xblank)
-	    cave[x][y-1] = Xacid_splash_w;
+	    cave[x][y-1] = Xsplash_w;
 	  play_element_sound(x, y, SOUND_acid, Xacid_1);
 	  return;
       }
@@ -2663,10 +2698,10 @@ static void Lalien(int x, int y)
     {
       switch (cave[x-1][y])
       {
+	case Zplayer:
 	case Xblank:
-	case Xacid_splash_e:
-	case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+	case Xsplash_e:
+	case Xsplash_w:
 	case Xfake_acid_1:
 	case Xfake_acid_2:
 	case Xfake_acid_3:
@@ -2675,10 +2710,8 @@ static void Lalien(int x, int y)
 	case Xfake_acid_6:
 	case Xfake_acid_7:
 	case Xfake_acid_8:
-#endif
 	case Xplant:
 	case Yplant:
-	case Zplayer:
 	  cave[x][y] = Yalien_wB;
 	  next[x][y] = Xblank;
 	  cave[x-1][y] = Yalien_w;
@@ -2697,9 +2730,9 @@ static void Lalien(int x, int y)
 	  cave[x][y] = Yalien_wB;
 	  next[x][y] = Xblank;
 	  if (cave[x][y-1] == Xblank)
-	    cave[x][y-1] = Xacid_splash_e;
+	    cave[x][y-1] = Xsplash_e;
 	  if (cave[x-2][y-1] == Xblank)
-	    cave[x-2][y-1] = Xacid_splash_w;
+	    cave[x-2][y-1] = Xsplash_w;
 	  play_element_sound(x, y, SOUND_acid, Xacid_1);
 	  return;
       }
@@ -2716,10 +2749,10 @@ static void Lbug_n(int x, int y)
 {
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2728,10 +2761,8 @@ static void Lbug_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ybug_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Ybug_n;
@@ -2750,9 +2781,9 @@ static void Lbug_n(int x, int y)
       cave[x][y] = Ybug_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-	cave[x+1][y-2] = Xacid_splash_e;
+	cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-	cave[x-1][y-2] = Xacid_splash_w;
+	cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2766,10 +2797,10 @@ 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);
 
@@ -2778,10 +2809,10 @@ static void Lbug_1_n(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2790,7 +2821,6 @@ static void Lbug_1_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -2801,7 +2831,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);
@@ -2815,10 +2844,10 @@ 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);
 
@@ -2832,10 +2861,10 @@ static void Lbug_e(int x, int y)
 {
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2844,10 +2873,8 @@ static void Lbug_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ybug_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Ybug_e;
@@ -2866,9 +2893,9 @@ static void Lbug_e(int x, int y)
       cave[x][y] = Ybug_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-	cave[x+2][y-1] = Xacid_splash_e;
+	cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_w;
+	cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2882,10 +2909,10 @@ 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);
 
@@ -2894,10 +2921,10 @@ static void Lbug_1_e(int x, int y)
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2906,7 +2933,6 @@ static void Lbug_1_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -2917,7 +2943,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);
@@ -2931,10 +2956,10 @@ 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);
 
@@ -2948,10 +2973,10 @@ static void Lbug_s(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2960,10 +2985,8 @@ static void Lbug_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ybug_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ybug_s;
@@ -2982,9 +3005,9 @@ static void Lbug_s(int x, int y)
       cave[x][y] = Ybug_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -2998,10 +3021,10 @@ 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);
 
@@ -3010,10 +3033,10 @@ static void Lbug_1_s(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3022,7 +3045,6 @@ static void Lbug_1_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3033,7 +3055,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);
@@ -3047,10 +3068,10 @@ 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);
 
@@ -3064,10 +3085,10 @@ static void Lbug_w(int x, int y)
 {
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3076,10 +3097,8 @@ static void Lbug_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ybug_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Ybug_w;
@@ -3098,9 +3117,9 @@ static void Lbug_w(int x, int y)
       cave[x][y] = Ybug_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_e;
+	cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-	cave[x-2][y-1] = Xacid_splash_w;
+	cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3114,10 +3133,10 @@ 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);
 
@@ -3126,10 +3145,10 @@ static void Lbug_1_w(int x, int y)
 
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3138,7 +3157,6 @@ static void Lbug_1_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3149,7 +3167,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);
@@ -3163,10 +3180,10 @@ 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);
 
@@ -3180,10 +3197,10 @@ static void Ltank_n(int x, int y)
 {
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3192,10 +3209,8 @@ static void Ltank_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ytank_nB;
       next[x][y] = Xblank;
       cave[x][y-1] = Ytank_n;
@@ -3214,9 +3229,9 @@ static void Ltank_n(int x, int y)
       cave[x][y] = Ytank_nB;
       next[x][y] = Xblank;
       if (cave[x+1][y-2] == Xblank)
-	cave[x+1][y-2] = Xacid_splash_e;
+	cave[x+1][y-2] = Xsplash_e;
       if (cave[x-1][y-2] == Xblank)
-	cave[x-1][y-2] = Xacid_splash_w;
+	cave[x-1][y-2] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3230,10 +3245,10 @@ 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);
 
@@ -3242,10 +3257,10 @@ static void Ltank_1_n(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3254,7 +3269,6 @@ static void Ltank_1_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3265,7 +3279,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);
@@ -3279,10 +3292,10 @@ 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);
 
@@ -3296,10 +3309,10 @@ static void Ltank_e(int x, int y)
 {
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3308,10 +3321,8 @@ static void Ltank_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ytank_eB;
       next[x][y] = Xblank;
       cave[x+1][y] = Ytank_e;
@@ -3330,9 +3341,9 @@ static void Ltank_e(int x, int y)
       cave[x][y] = Ytank_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-	cave[x+2][y-1] = Xacid_splash_e;
+	cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_w;
+	cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3346,10 +3357,10 @@ 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);
 
@@ -3358,10 +3369,10 @@ static void Ltank_1_e(int x, int y)
 
   switch (cave[x][y-1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3370,7 +3381,6 @@ static void Ltank_1_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3381,7 +3391,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);
@@ -3395,10 +3404,10 @@ 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);
 
@@ -3412,10 +3421,10 @@ static void Ltank_s(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3424,10 +3433,8 @@ static void Ltank_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ytank_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ytank_s;
@@ -3446,9 +3453,9 @@ static void Ltank_s(int x, int y)
       cave[x][y] = Ytank_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3462,10 +3469,10 @@ 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);
 
@@ -3474,10 +3481,10 @@ static void Ltank_1_s(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3486,7 +3493,6 @@ static void Ltank_1_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3497,7 +3503,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);
@@ -3511,10 +3516,10 @@ 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);
 
@@ -3528,10 +3533,10 @@ static void Ltank_w(int x, int y)
 {
   switch (cave[x-1][y])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3540,10 +3545,8 @@ static void Ltank_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ytank_wB;
       next[x][y] = Xblank;
       cave[x-1][y] = Ytank_w;
@@ -3562,9 +3565,9 @@ static void Ltank_w(int x, int y)
       cave[x][y] = Ytank_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_e;
+	cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-	cave[x-2][y-1] = Xacid_splash_w;
+	cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3578,10 +3581,10 @@ 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);
 
@@ -3590,10 +3593,10 @@ static void Ltank_1_w(int x, int y)
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3602,7 +3605,6 @@ static void Ltank_1_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3613,7 +3615,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);
@@ -3627,10 +3628,10 @@ 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);
 
@@ -3645,9 +3646,8 @@ static void Lemerald(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3656,7 +3656,6 @@ static void Lemerald(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yemerald_s;
@@ -3674,16 +3673,12 @@ static void Lemerald(int x, int y)
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -3693,24 +3688,20 @@ static void Lemerald(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
-    case Xwonderwall:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -3719,12 +3710,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:
@@ -3733,43 +3729,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;
 	}
       }
@@ -3790,9 +3798,8 @@ static void Lemerald_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3801,7 +3808,6 @@ static void Lemerald_pause(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yemerald_s;
@@ -3819,9 +3825,9 @@ static void Lemerald_pause(int x, int y)
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3836,10 +3842,10 @@ static void Lemerald_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3848,8 +3854,6 @@ static void Lemerald_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
-    case Zplayer:
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yemerald_s;
@@ -3867,9 +3871,9 @@ static void Lemerald_fall(int x, int y)
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -3878,13 +3882,12 @@ static void Lemerald_fall(int x, int y)
       {
 	lev.wonderwall_state = 1;
 	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;
       }
@@ -3902,9 +3905,8 @@ static void Ldiamond(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -3913,7 +3915,6 @@ static void Ldiamond(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ydiamond_s;
@@ -3931,16 +3932,12 @@ static void Ldiamond(int x, int y)
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -3950,24 +3947,20 @@ static void Ldiamond(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
-    case Xwonderwall:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -3976,12 +3969,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:
@@ -3990,43 +3988,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;
 	}
       }
@@ -4047,9 +4057,8 @@ static void Ldiamond_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4058,7 +4067,6 @@ static void Ldiamond_pause(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ydiamond_s;
@@ -4076,9 +4084,9 @@ static void Ldiamond_pause(int x, int y)
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4093,10 +4101,10 @@ static void Ldiamond_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4105,8 +4113,6 @@ static void Ldiamond_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
-    case Zplayer:
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ydiamond_s;
@@ -4124,9 +4130,9 @@ static void Ldiamond_fall(int x, int y)
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4135,13 +4141,12 @@ static void Ldiamond_fall(int x, int y)
       {
 	lev.wonderwall_state = 1;
 	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;
       }
@@ -4159,9 +4164,8 @@ static void Lstone(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4170,7 +4174,6 @@ static void Lstone(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
       cave[x][y] = Ystone_sB;
@@ -4190,9 +4193,9 @@ static void Lstone(int x, int y)
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4203,10 +4206,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:
@@ -4216,23 +4215,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 Xslidewall_ns:
-    case Xslidewall_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -4241,51 +4237,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;
 	}
       }
@@ -4297,9 +4309,8 @@ static void Lstone_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4308,7 +4319,6 @@ static void Lstone_pause(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ystone_s;
@@ -4326,9 +4336,9 @@ static void Lstone_pause(int x, int y)
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4343,10 +4353,10 @@ static void Lstone_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4355,8 +4365,6 @@ static void Lstone_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
-    case Zplayer:
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ystone_s;
@@ -4374,19 +4382,28 @@ static void Lstone_fall(int x, int y)
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xnut:
-    case Xnut_pause:
-      next[x][y] = Xstone;
-      cave[x][y+1] = Ynut_stone;
-      next[x][y+1] = Xemerald;
-      play_element_sound(x, y, SOUND_crack, Xnut);
-      score += lev.nut_score;
+    case Xeater_n:
+    case Xeater_e:
+    case Xeater_s:
+    case Xeater_w:
+      cave[x][y] = Ystone_sB;
+      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 Xbug_1_n:
@@ -4417,90 +4434,14 @@ static void Lstone_fall(int x, int y)
       score += lev.tank_score;
       return;
 
-    case Xspring:
-      if (RANDOM(2))
-      {
-	switch (cave[x+1][y+1])
-	{
-	  case Xblank:
-	  case Xacid_splash_e:
-	  case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
-	  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:
-#endif
-	  case Xalien:
-	  case Xalien_pause:
-	    cave[x][y+1] = Xspring_e;
-	    break;
-
-	  default:
-	    cave[x][y+1] = Xspring_w;
-	    break;
-	}
-      }
-      else
-      {
-	switch (cave[x-1][y+1])
-	{
-	  case Xblank:
-	  case Xacid_splash_e:
-	  case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
-	  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:
-#endif
-	  case Xalien:
-	  case Xalien_pause:
-	    cave[x][y+1] = Xspring_w;
-	    break;
-	  default:
-	    cave[x][y+1] = Xspring_e;
-	    break;
-	}
-      }
-
-      next[x][y] = Xstone;
-      return;
-
-    case Xeater_n:
-    case Xeater_e:
-    case Xeater_s:
-    case Xeater_w:
-      cave[x][y] = Ystone_sB;
-      cave[x][y+1] = Yeater_stone;
-      Lboom_eater(x, y+1, Xstone_fall);
-      score += lev.eater_score;
-      return;
-
-    case Xalien:
-    case Xalien_pause:
-      cave[x][y] = Ystone_sB;
-      cave[x][y+1] = Yalien_stone;
-      Lboom_tank(x, y+1, Xstone_fall);
-      score += lev.alien_score;
-      return;
-
-    case Xdiamond:
-    case Xdiamond_pause:
-      switch (cave[x][y+2])
+    case Xdiamond:
+    case Xdiamond_pause:
+      switch (cave[x][y+2])
       {
+	case Zplayer:
 	case Xblank:
-	case Xacid_splash_e:
-	case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+	case Xsplash_e:
+	case Xsplash_w:
 	case Xfake_acid_1:
 	case Xfake_acid_2:
 	case Xfake_acid_3:
@@ -4509,8 +4450,25 @@ static void Lstone_fall(int x, int y)
 	case Xfake_acid_6:
 	case Xfake_acid_7:
 	case Xfake_acid_8:
-#endif
-	case Zplayer:
+	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:
@@ -4527,32 +4485,13 @@ static void Lstone_fall(int x, int y)
 	case Xtank_2_e:
 	case Xtank_2_s:
 	case Xtank_2_w:
-	case Xspring_fall:
-	case Xandroid:
-	case Xandroid_1_n:
-	case Xandroid_2_n:
-	case Xandroid_1_e:
-	case Xandroid_2_e:
-	case Xandroid_1_s:
-	case Xandroid_2_s:
-	case Xandroid_1_w:
-	case Xandroid_2_w:
-	case Xstone_fall:
 	case Xemerald_fall:
 	case Xdiamond_fall:
+	case Xstone_fall:
 	case Xbomb_fall:
-	case Xacid_s:
-	case Xacid_1:
-	case Xacid_2:
-	case Xacid_3:
-	case Xacid_4:
-	case Xacid_5:
-	case Xacid_6:
-	case Xacid_7:
-	case Xacid_8:
 	case Xnut_fall:
-	case Xplant:
-	case Yplant:
+	case Xspring_fall:
+	case Xacid_s:
 	  next[x][y] = Xstone;
 	  play_element_sound(x, y, SOUND_stone, Xstone);
 	  return;
@@ -4571,19 +4510,80 @@ static void Lstone_fall(int x, int y)
       Lboom_tank(x, y+1, Xstone_fall);
       return;
 
+    case Xnut:
+    case Xnut_pause:
+      next[x][y] = Xstone;
+      cave[x][y+1] = Ynut_stone;
+      next[x][y+1] = Xemerald;
+      play_element_sound(x, y, SOUND_crack, Xnut);
+      score += lev.nut_score;
+      return;
+
+    case Xspring:
+      if (RANDOM(2))
+      {
+	switch (cave[x+1][y+1])
+	{
+	  case Xblank:
+	  case Xsplash_e:
+	  case Xsplash_w:
+	  case Xfake_acid_1:
+	  case Xfake_acid_2:
+	  case Xfake_acid_3:
+	  case Xfake_acid_4:
+	  case Xfake_acid_5:
+	  case Xfake_acid_6:
+	  case Xfake_acid_7:
+	  case Xfake_acid_8:
+	  case Xalien:
+	  case Xalien_pause:
+	    cave[x][y+1] = Xspring_e;
+	    break;
+
+	  default:
+	    cave[x][y+1] = Xspring_w;
+	    break;
+	}
+      }
+      else
+      {
+	switch (cave[x-1][y+1])
+	{
+	  case Xblank:
+	  case Xsplash_e:
+	  case Xsplash_w:
+	  case Xfake_acid_1:
+	  case Xfake_acid_2:
+	  case Xfake_acid_3:
+	  case Xfake_acid_4:
+	  case Xfake_acid_5:
+	  case Xfake_acid_6:
+	  case Xfake_acid_7:
+	  case Xfake_acid_8:
+	  case Xalien:
+	  case Xalien_pause:
+	    cave[x][y+1] = Xspring_w;
+	    break;
+	  default:
+	    cave[x][y+1] = Xspring_e;
+	    break;
+	}
+      }
+
+      next[x][y] = Xstone;
+      return;
+
     case Xwonderwall:
       if (lev.wonderwall_time)
       {
 	lev.wonderwall_state = 1;
 	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;
       }
@@ -4601,9 +4601,8 @@ static void Lbomb(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4612,7 +4611,6 @@ static void Lbomb(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ybomb_s;
@@ -4630,16 +4628,12 @@ static void Lbomb(int x, int y)
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -4649,23 +4643,20 @@ static void Lbomb(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -4674,49 +4665,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;
 	}
       }
@@ -4728,9 +4735,8 @@ static void Lbomb_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4739,7 +4745,6 @@ static void Lbomb_pause(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ybomb_s;
@@ -4757,9 +4762,9 @@ static void Lbomb_pause(int x, int y)
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4775,9 +4780,8 @@ static void Lbomb_fall(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4786,7 +4790,6 @@ static void Lbomb_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ybomb_s;
@@ -4804,9 +4807,9 @@ static void Lbomb_fall(int x, int y)
       cave[x][y] = Ybomb_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4822,9 +4825,8 @@ static void Lnut(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4833,7 +4835,6 @@ static void Lnut(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ynut_s;
@@ -4851,16 +4852,12 @@ static void Lnut(int x, int y)
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -4870,23 +4867,20 @@ static void Lnut(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -4895,49 +4889,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;
 	}
       }
@@ -4949,9 +4959,8 @@ static void Lnut_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4960,7 +4969,6 @@ static void Lnut_pause(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ynut_s;
@@ -4978,9 +4986,9 @@ static void Lnut_pause(int x, int y)
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -4995,10 +5003,10 @@ static void Lnut_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -5007,8 +5015,6 @@ static void Lnut_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
-    case Zplayer:
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ynut_s;
@@ -5026,9 +5032,9 @@ static void Lnut_fall(int x, int y)
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -5045,9 +5051,8 @@ static void Lspring(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -5056,7 +5061,6 @@ static void Lspring(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
       cave[x][y] = Yspring_sB;
@@ -5076,16 +5080,12 @@ static void Lspring(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xspring:
-    case Xspring_pause:
-    case Xspring_e:
-    case Xspring_w:
     case Xandroid:
     case Xandroid_1_n:
     case Xandroid_2_n:
@@ -5095,23 +5095,20 @@ static void Lspring(int x, int y)
     case Xandroid_2_s:
     case Xandroid_1_w:
     case Xandroid_2_w:
-    case Xstone:
-    case Xstone_pause:
     case Xemerald:
     case Xemerald_pause:
     case Xdiamond:
     case Xdiamond_pause:
+    case Xstone:
+    case Xstone_pause:
     case Xbomb:
     case Xbomb_pause:
-    case Xballoon:
-    case Xacid_ne:
-    case Xacid_nw:
-    case Xball_1:
-    case Xball_2:
     case Xnut:
     case Xnut_pause:
-    case Xslidewall_ns:
-    case Xslidewall_ew:
+    case Xspring:
+    case Xspring_pause:
+    case Xspring_e:
+    case Xspring_w:
     case Xkey_1:
     case Xkey_2:
     case Xkey_3:
@@ -5120,77 +5117,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;
 	}
       }
@@ -5202,9 +5203,8 @@ static void Lspring_pause(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -5213,7 +5213,6 @@ static void Lspring_pause(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -5231,9 +5230,9 @@ static void Lspring_pause(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -5249,9 +5248,8 @@ static void Lspring_e(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -5260,7 +5258,6 @@ static void Lspring_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -5278,22 +5275,21 @@ static void Lspring_e(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
     case Xbumper:
-      cave[x][y+1] = XbumperB;
+      cave[x][y+1] = Ybumper;
   }
 
   switch (cave[x+1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -5302,7 +5298,6 @@ static void Lspring_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Yalien_nB:
     case Yalien_eB:
     case Yalien_sB:
@@ -5324,9 +5319,9 @@ static void Lspring_e(int x, int y)
       cave[x][y] = Yspring_eB;
       next[x][y] = Xblank;
       if (cave[x+2][y-1] == Xblank)
-	cave[x+2][y-1] = Xacid_splash_e;
+	cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_w;
+	cave[x][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -5345,8 +5340,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;
@@ -5364,9 +5359,8 @@ static void Lspring_w(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -5375,7 +5369,6 @@ static void Lspring_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -5393,22 +5386,21 @@ static void Lspring_w(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
     case Xbumper:
-      cave[x][y+1] = XbumperB;
+      cave[x][y+1] = Ybumper;
   }
 
   switch (cave[x-1][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -5417,7 +5409,6 @@ static void Lspring_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Yalien_nB:
     case Yalien_eB:
     case Yalien_sB:
@@ -5439,9 +5430,9 @@ static void Lspring_w(int x, int y)
       cave[x][y] = Yspring_wB;
       next[x][y] = Xblank;
       if (cave[x][y-1] == Xblank)
-	cave[x][y-1] = Xacid_splash_e;
+	cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
-	cave[x-2][y-1] = Xacid_splash_w;
+	cave[x-2][y-1] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -5460,8 +5451,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;
@@ -5478,10 +5469,10 @@ static void Lspring_fall(int x, int y)
 {
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -5490,8 +5481,6 @@ static void Lspring_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
-    case Zplayer:
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -5509,16 +5498,28 @@ static void Lspring_fall(int x, int y)
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
-    case Xbomb:
-    case Xbomb_pause:
-      cave[x][y+1] = Ybomb_blank;
+    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;
       return;
 
     case Xbug_1_n:
@@ -5549,22 +5550,10 @@ static void Lspring_fall(int x, int y)
       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;
+    case Xbomb:
+    case Xbomb_pause:
+      cave[x][y+1] = Ybomb_blank;
       Lboom_tank(x, y+1, Xspring_fall);
-      score += lev.alien_score;
       return;
 
     default:
@@ -5577,302 +5566,482 @@ 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 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 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 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 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 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 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 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 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 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 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 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 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)
@@ -5960,9 +6129,8 @@ static void Lballoon(int x, int y)
       switch (cave[x][y-1])
       {
 	case Xblank:
-	case Xacid_splash_e:
-	case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+	case Xsplash_e:
+	case Xsplash_w:
 	case Xfake_acid_1:
 	case Xfake_acid_2:
 	case Xfake_acid_3:
@@ -5971,7 +6139,6 @@ static void Lballoon(int x, int y)
 	case Xfake_acid_6:
 	case Xfake_acid_7:
 	case Xfake_acid_8:
-#endif
 	  cave[x][y] = Yballoon_nB;
 	  next[x][y] = Xblank;
 	  cave[x][y-1] = Yballoon_n;
@@ -5989,9 +6156,9 @@ static void Lballoon(int x, int y)
 	  cave[x][y] = Yballoon_nB;
 	  next[x][y] = Xblank;
 	  if (cave[x+1][y-2] == Xblank)
-	    cave[x+1][y-2] = Xacid_splash_e;
+	    cave[x+1][y-2] = Xsplash_e;
 	  if (cave[x-1][y-2] == Xblank)
-	    cave[x-1][y-2] = Xacid_splash_w;
+	    cave[x-1][y-2] = Xsplash_w;
 	  play_element_sound(x, y, SOUND_acid, Xacid_1);
 	  return;
       }
@@ -6001,9 +6168,8 @@ static void Lballoon(int x, int y)
       switch (cave[x+1][y])
       {
 	case Xblank:
-	case Xacid_splash_e:
-	case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+	case Xsplash_e:
+	case Xsplash_w:
 	case Xfake_acid_1:
 	case Xfake_acid_2:
 	case Xfake_acid_3:
@@ -6012,7 +6178,6 @@ static void Lballoon(int x, int y)
 	case Xfake_acid_6:
 	case Xfake_acid_7:
 	case Xfake_acid_8:
-#endif
 	  cave[x][y] = Yballoon_eB;
 	  next[x][y] = Xblank;
 	  cave[x+1][y] = Yballoon_e;
@@ -6030,9 +6195,9 @@ static void Lballoon(int x, int y)
 	  cave[x][y] = Yballoon_eB;
 	  next[x][y] = Xblank;
 	  if (cave[x+2][y-1] == Xblank)
-	    cave[x+2][y-1] = Xacid_splash_e;
+	    cave[x+2][y-1] = Xsplash_e;
 	  if (cave[x][y-1] == Xblank)
-	    cave[x][y-1] = Xacid_splash_w;
+	    cave[x][y-1] = Xsplash_w;
 	  play_element_sound(x, y, SOUND_acid, Xacid_1);
 	  return;
       }
@@ -6042,9 +6207,8 @@ static void Lballoon(int x, int y)
       switch (cave[x][y+1])
       {
 	case Xblank:
-	case Xacid_splash_e:
-	case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+	case Xsplash_e:
+	case Xsplash_w:
 	case Xfake_acid_1:
 	case Xfake_acid_2:
 	case Xfake_acid_3:
@@ -6053,7 +6217,6 @@ static void Lballoon(int x, int y)
 	case Xfake_acid_6:
 	case Xfake_acid_7:
 	case Xfake_acid_8:
-#endif
 	  cave[x][y] = Yballoon_sB;
 	  next[x][y] = Xblank;
 	  cave[x][y+1] = Yballoon_s;
@@ -6071,9 +6234,9 @@ static void Lballoon(int x, int y)
 	  cave[x][y] = Yballoon_sB;
 	  next[x][y] = Xblank;
 	  if (cave[x+1][y] == Xblank)
-	    cave[x+1][y] = Xacid_splash_e;
+	    cave[x+1][y] = Xsplash_e;
 	  if (cave[x-1][y] == Xblank)
-	    cave[x-1][y] = Xacid_splash_w;
+	    cave[x-1][y] = Xsplash_w;
 	  play_element_sound(x, y, SOUND_acid, Xacid_1);
 	  return;
       }
@@ -6083,9 +6246,8 @@ static void Lballoon(int x, int y)
       switch (cave[x-1][y])
       {
 	case Xblank:
-	case Xacid_splash_e:
-	case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+	case Xsplash_e:
+	case Xsplash_w:
 	case Xfake_acid_1:
 	case Xfake_acid_2:
 	case Xfake_acid_3:
@@ -6094,7 +6256,6 @@ static void Lballoon(int x, int y)
 	case Xfake_acid_6:
 	case Xfake_acid_7:
 	case Xfake_acid_8:
-#endif
 	  cave[x][y] = Yballoon_wB;
 	  next[x][y] = Xblank;
 	  cave[x-1][y] = Yballoon_w;
@@ -6112,9 +6273,9 @@ static void Lballoon(int x, int y)
 	  cave[x][y] = Yballoon_wB;
 	  next[x][y] = Xblank;
 	  if (cave[x][y-1] == Xblank)
-	    cave[x][y-1] = Xacid_splash_e;
+	    cave[x][y-1] = Xsplash_e;
 	  if (cave[x-2][y-1] == Xblank)
-	    cave[x-2][y-1] = Xacid_splash_w;
+	    cave[x-2][y-1] = Xsplash_w;
 	  play_element_sound(x, y, SOUND_acid, Xacid_1);
 	  return;
       }
@@ -6132,7 +6293,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];
@@ -6141,7 +6302,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];
@@ -6150,7 +6311,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];
@@ -6159,7 +6320,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];
@@ -6168,7 +6329,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];
@@ -6177,7 +6338,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];
@@ -6186,7 +6347,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];
@@ -6195,7 +6356,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];
@@ -6206,56 +6367,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];
@@ -6302,10 +6463,10 @@ static void Ldrip_fall(int x, int y)
 
   switch (cave[x][y+1])
   {
+    case Zplayer:
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -6314,10 +6475,8 @@ static void Ldrip_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
     case Xplant:
     case Yplant:
-    case Zplayer:
       cave[x][y] = Ydrip_1_sB;
       next[x][y] = Xdrip_stretchB;
       cave[x][y+1] = Ydrip_1_s;
@@ -6335,9 +6494,9 @@ static void Ldrip_fall(int x, int y)
       cave[x][y] = Ydrip_1_sB;
       next[x][y] = Xdrip_stretchB;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -6377,7 +6536,7 @@ static void Lwonderwall(int x, int y)
 {
   if (lev.wonderwall_time && lev.wonderwall_state)
   {
-    cave[x][y] = XwonderwallB;
+    cave[x][y] = Ywonderwall;
     play_element_sound(x, y, SOUND_wonder, Xwonderwall);
   }
 }
@@ -6385,31 +6544,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;
+    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)
@@ -6417,9 +6576,8 @@ static void Lsand_stone(int x, int y)
   switch (cave[x][y+1])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -6428,7 +6586,6 @@ static void Lsand_stone(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
       cave[x][y] = Xsand_stonesand_quickout_1;
       next[x][y] = Xsand_stonesand_quickout_2;
       cave[x][y+1] = Xsand_stoneout_1;
@@ -6446,9 +6603,9 @@ static void Lsand_stone(int x, int y)
       cave[x][y] = Xsand_stonesand_quickout_1;
       next[x][y] = Xsand_stonesand_quickout_2;
       if (cave[x+1][y] == Xblank)
-	cave[x+1][y] = Xacid_splash_e;
+	cave[x+1][y] = Xsplash_e;
       if (cave[x-1][y] == Xblank)
-	cave[x-1][y] = Xacid_splash_w;
+	cave[x-1][y] = Xsplash_w;
       play_element_sound(x, y, SOUND_acid, Xacid_1);
       return;
 
@@ -6531,7 +6688,6 @@ static void Lsand_stoneout_2(int x, int y)
   next[x][y] = Xstone_fall;
 }
 
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
 static void Lsand_stonesand_quickout_1(int x, int y)
 {
   next[x][y] = Xsand_stonesand_quickout_2;
@@ -6541,45 +6697,44 @@ static void Lsand_stonesand_quickout_2(int x, int y)
 {
   next[x][y] = Xsand;
 }
-#endif
 
-static void Lslidewall_ns(int x, int y)
+static void Lslide_ns(int x, int y)
 {
-  if (tab_blank[cave[x][y-1]])
+  if (is_blank[cave[x][y-1]])
   {
-    cave[x][y-1] = Yslidewall_ns_blank;
-    next[x][y-1] = Xslidewall_ns;
-    play_element_sound(x, y, SOUND_slidewall, Xslidewall_ns);
+    cave[x][y-1] = Yslide_ns_blank;
+    next[x][y-1] = Xslide_ns;
+    play_element_sound(x, y, SOUND_slide, Xslide_ns);
   }
 
-  if (tab_blank[cave[x][y+1]])
+  if (is_blank[cave[x][y+1]])
   {
-    cave[x][y+1] = Yslidewall_ns_blank;
-    next[x][y+1] = Xslidewall_ns;
-    play_element_sound(x, y, SOUND_slidewall, Xslidewall_ns);
+    cave[x][y+1] = Yslide_ns_blank;
+    next[x][y+1] = Xslide_ns;
+    play_element_sound(x, y, SOUND_slide, Xslide_ns);
   }
 }
 
-static void Lslidewall_ew(int x, int y)
+static void Lslide_ew(int x, int y)
 {
-  if (tab_blank[cave[x+1][y]])
+  if (is_blank[cave[x+1][y]])
   {
-    cave[x+1][y] = Yslidewall_ew_blank;
-    next[x+1][y] = Xslidewall_ew;
-    play_element_sound(x, y, SOUND_slidewall, Xslidewall_ew);
+    cave[x+1][y] = Yslide_ew_blank;
+    next[x+1][y] = Xslide_ew;
+    play_element_sound(x, y, SOUND_slide, Xslide_ew);
   }
 
-  if (tab_blank[cave[x-1][y]])
+  if (is_blank[cave[x-1][y]])
   {
-    cave[x-1][y] = Yslidewall_ew_blank;
-    next[x-1][y] = Xslidewall_ew;
-    play_element_sound(x, y, SOUND_slidewall, Xslidewall_ew);
+    cave[x-1][y] = Yslide_ew_blank;
+    next[x-1][y] = Xslide_ew;
+    play_element_sound(x, y, SOUND_slide, Xslide_ew);
   }
 }
 
 static void Lexit(int x, int y)
 {
-  if (lev.required > 0)
+  if (lev.gems_needed > 0)
     return;
 
   switch (RANDOM(64) / 21)
@@ -6628,9 +6783,8 @@ static void Lamoeba(int x, int y)
   switch (cave[x][y])
   {
     case Xblank:
-    case Xacid_splash_e:
-    case Xacid_splash_w:
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xsplash_e:
+    case Xsplash_w:
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -6639,46 +6793,136 @@ static void Lamoeba(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
-#endif
+    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 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;
+      return;
+
+    case Xbomb:
+    case Xbomb_pause:
+    case Xbomb_fall:
+      cave[x][y] = Xboom_tank;
+      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_nine(x, y, FALSE);
+      break;
+
+    case Ztank:
+      Lboom_nine(x, y, FALSE);
+      break;
+
+    case Zeater:
+      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;
   }
 }
@@ -6721,7 +6965,6 @@ static void handle_tile(int x, int y)
     case Xacid_7:		Lacid_7(x, y);			break;
     case Xacid_8:		Lacid_8(x, y);			break;
 
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xfake_acid_1:		Lfake_acid_1(x, y);		break;
     case Xfake_acid_2:		Lfake_acid_2(x, y);		break;
     case Xfake_acid_3:		Lfake_acid_3(x, y);		break;
@@ -6730,7 +6973,6 @@ static void handle_tile(int x, int y)
     case Xfake_acid_6:		Lfake_acid_6(x, y);		break;
     case Xfake_acid_7:		Lfake_acid_7(x, y);		break;
     case Xfake_acid_8:		Lfake_acid_8(x, y);		break;
-#endif
 
     case Xandroid:		Landroid(x, y);			break;
     case Xandroid_1_n:		Landroid_1_n(x, y);		break;
@@ -6856,13 +7098,11 @@ static void handle_tile(int x, int y)
     case Xsand_stonesand_4:	Lsand_stonesand_4(x, y);	break;
     case Xsand_stoneout_1:	Lsand_stoneout_1(x, y);		break;
     case Xsand_stoneout_2:	Lsand_stoneout_2(x, y);		break;
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xsand_stonesand_quickout_1: Lsand_stonesand_quickout_1(x, y); break;
     case Xsand_stonesand_quickout_2: Lsand_stonesand_quickout_2(x, y); break;
-#endif
 
-    case Xslidewall_ns:		Lslidewall_ns(x, y);		break;
-    case Xslidewall_ew:		Lslidewall_ew(x, y);		break;
+    case Xslide_ns:		Lslide_ns(x, y);		break;
+    case Xslide_ew:		Lslide_ew(x, y);		break;
 
     case Xexit:			Lexit(x, y);			break;
     case Xexit_1:		Lexit_1(x, y);			break;
@@ -6872,14 +7112,14 @@ 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 Xboom_tank:		Lboom_tank(x, y, Xboom_tank);	break;
     case Xboom_android:		Lboom_android(x, y);		break;
     case Xboom_1:		Lboom_1(x, y);			break;
     case Xboom_2:		Lboom_2(x, y);			break;
   }
 }
 
-void logic_1(void)
+void logic_players(void)
 {
   int start_check_nr;
   int i;
@@ -6918,7 +7158,8 @@ void logic_1(void)
     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++)
   {
@@ -6947,7 +7188,7 @@ void logic_1(void)
   }
 }
 
-void logic_2(void)
+void logic_objects(void)
 {
   int x, y;
 
@@ -6955,7 +7196,7 @@ void logic_2(void)
   next = lev.next;
   boom = lev.boom;
 
-  seed = RandomEM;
+  seed = game_em.random;
   score = 0;
 
   for (y = lev.top; y < lev.bottom; y++)
@@ -6967,7 +7208,7 @@ void logic_2(void)
   else
     game_em.game_over = TRUE;
 
-  RandomEM = seed;
+  game_em.random = seed;
 
   /* triple buffering */
   void *temp = lev.cave;
@@ -6976,7 +7217,7 @@ void logic_2(void)
   lev.draw = temp;
 }
 
-void logic_3(void)
+void logic_globals(void)
 {
   int x;
   int y;
@@ -7015,7 +7256,7 @@ void logic_3(void)
 
   /* grow amoeba */
 
-  random = RandomEM;
+  random = game_em.random;
 
   for (count = lev.amoeba_time; count--;)
   {
@@ -7029,7 +7270,7 @@ void logic_3(void)
     random = random * 129 + 1;
   }
 
-  RandomEM = random;
+  game_em.random = random;
 
   /* handle explosions */