fixed handling of player at fake acid for EM engine

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

diff --git a/src/game_em/logic.c b/src/game_em/logic.c
index 2e959ffeeea12a38deb8a2f9113463a9b54fbcef..4b489d8a507dee65da5f9b7c35f79bb48ec62cc2 100644 (file)
--- a/src/game_em/logic.c
+++ b/src/game_em/logic.c
@@ -10,17 +10,17 @@
 
 #define SPRING_ROLL    /* spring rolling off round things continues to roll */
 #define ACID_ROLL      /* rolling objects go into acid rather than remove it */
+#define ACID_PLAYER    /* player gets killed by acid, but without explosion */
 
-#define USE_CHANGED_ACID_STUFF
+#define RANDOM_BUG     /* handle problem with old tapes using 64-bit random */
 
-#define RANDOM_RAW     (seed = seed << 31 | seed >> 1)
-#define RANDOM(x)      (RANDOM_RAW & (x - 1))
+#define RANDOM(x)      ((seed = seed << 31 | seed >> 1) % x)
 
 static short **cave, **next, **boom;
 static unsigned int seed;
 static int score;
 
-static const byte is_blank[TILE_MAX] =
+static const byte is_blank[GAME_TILE_MAX] =
 {
   [Xblank]             = 1,
   [Xsplash_e]          = 1,
@@ -35,7 +35,7 @@ static const byte is_blank[TILE_MAX] =
   [Xfake_acid_8]       = 1
 };
 
-static const byte is_blank_or_acid[TILE_MAX] =
+static const byte is_blank_or_acid[GAME_TILE_MAX] =
 {
   [Xblank]             = 1,
   [Xsplash_e]          = 1,
@@ -58,7 +58,7 @@ static const byte is_blank_or_acid[TILE_MAX] =
   [Xacid_8]            = 1
 };
 
-static const byte is_fake_acid[TILE_MAX] =
+static const byte is_fake_acid[GAME_TILE_MAX] =
 {
   [Xfake_acid_1]       = 1,
   [Xfake_acid_2]       = 1,
@@ -70,7 +70,48 @@ static const byte is_fake_acid[TILE_MAX] =
   [Xfake_acid_8]       = 1
 };
 
-static const byte is_amoeba[TILE_MAX] =
+static const byte is_player[GAME_TILE_MAX] =
+{
+  [Zplayer]            = 1,
+  [Xfake_acid_1_player]        = 1,
+  [Xfake_acid_2_player]        = 1,
+  [Xfake_acid_3_player]        = 1,
+  [Xfake_acid_4_player]        = 1,
+  [Xfake_acid_5_player]        = 1,
+  [Xfake_acid_6_player]        = 1,
+  [Xfake_acid_7_player]        = 1,
+  [Xfake_acid_8_player]        = 1
+};
+
+static const byte add_player[GAME_TILE_MAX] =
+{
+  [Xblank]             = Zplayer,
+  [Xsplash_e]          = Zplayer,
+  [Xsplash_w]          = Zplayer,
+  [Xfake_acid_1]       = Xfake_acid_1_player,
+  [Xfake_acid_2]       = Xfake_acid_2_player,
+  [Xfake_acid_3]       = Xfake_acid_3_player,
+  [Xfake_acid_4]       = Xfake_acid_4_player,
+  [Xfake_acid_5]       = Xfake_acid_5_player,
+  [Xfake_acid_6]       = Xfake_acid_6_player,
+  [Xfake_acid_7]       = Xfake_acid_7_player,
+  [Xfake_acid_8]       = Xfake_acid_8_player
+};
+
+static const byte remove_player[GAME_TILE_MAX] =
+{
+  [Zplayer]            = Xblank,
+  [Xfake_acid_1_player]        = Xfake_acid_1,
+  [Xfake_acid_2_player]        = Xfake_acid_2,
+  [Xfake_acid_3_player]        = Xfake_acid_3,
+  [Xfake_acid_4_player]        = Xfake_acid_4,
+  [Xfake_acid_5_player]        = Xfake_acid_5,
+  [Xfake_acid_6_player]        = Xfake_acid_6,
+  [Xfake_acid_7_player]        = Xfake_acid_7,
+  [Xfake_acid_8_player]        = Xfake_acid_8
+};
+
+static const byte is_amoeba[GAME_TILE_MAX] =
 {
   [Xfake_amoeba]       = 1,
   [Yfake_amoeba]       = 1,
@@ -84,7 +125,22 @@ static const byte is_amoeba[TILE_MAX] =
   [Xamoeba_8]          = 1
 };
 
-static const byte is_android_walkable[TILE_MAX] =
+static byte is_android_blank[GAME_TILE_MAX] =
+{
+  [Xblank]             = 1,
+  [Xsplash_e]          = 1,
+  [Xsplash_w]          = 1,
+  [Xfake_acid_1]       = 1,
+  [Xfake_acid_2]       = 1,
+  [Xfake_acid_3]       = 1,
+  [Xfake_acid_4]       = 1,
+  [Xfake_acid_5]       = 1,
+  [Xfake_acid_6]       = 1,
+  [Xfake_acid_7]       = 1,
+  [Xfake_acid_8]       = 1
+};
+
+static const byte is_android_walkable[GAME_TILE_MAX] =
 {
   [Xblank]             = 1,
   [Xsplash_e]          = 1,
@@ -152,7 +208,7 @@ static void Lboom_eater(int x, int y)
   boom[x][y+1]   = lev.eater_array[lev.eater_pos][7];
   boom[x+1][y+1] = lev.eater_array[lev.eater_pos][8];
 
-  lev.eater_pos = (lev.eater_pos + 1) & 7;
+  lev.eater_pos = (lev.eater_pos + 1) % lev.num_eater_arrays;
 
 #if PLAY_ELEMENT_SOUND
   play_element_sound(x, y, SOUND_boom, Xeater_n);
@@ -216,6 +272,31 @@ static void Lboom_eater_new(int x, int y, boolean chain_explosion)
   Lboom_eater(x, y);
 }
 
+static void Lboom_cave_new(int x, int y, int element)
+{
+  if (game_em.use_old_explosions)
+    return;
+
+  cave[x][y] = element;
+}
+
+static void Lboom_next_new(int x, int y, int element)
+{
+  if (game_em.use_old_explosions)
+    return;
+
+  next[x][y] = element;
+}
+
+static void Lpush_element_old(int x, int y, int element)
+{
+  if (!game_em.use_old_push_elements)
+    return;
+
+  cave[x][y] = element;
+  next[x][y] = element;
+}
+
 static boolean player_killed(struct PLAYER *ply)
 {
   int x = ply->x;
@@ -325,6 +406,14 @@ static boolean player_killed(struct PLAYER *ply)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xdynamite_1:
     case Xdynamite_2:
     case Xdynamite_3:
@@ -340,7 +429,7 @@ static void kill_player(struct PLAYER *ply)
   int x = ply->x;
   int y = ply->y;
 
-  ply->alive = 0;
+  ply->alive = FALSE;
 
   switch (cave[x][y-1])
   {
@@ -467,7 +556,7 @@ static void kill_player(struct PLAYER *ply)
 
   switch (cave[x][y])
   {
-#ifdef USE_CHANGED_ACID_STUFF
+#ifdef ACID_PLAYER
     case Xacid_1:
     case Xacid_2:
     case Xacid_3:
@@ -501,7 +590,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
   if (dx && dy && ply->joy_snap)       /* more than one direction specified */
     return FALSE;
 
-  if (ply->joy_snap == 0)              /* player wants to move */
+  if (!ply->joy_snap)                  /* player wants to move */
   {
     int element = cave[x][y];
 
@@ -511,8 +600,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xblank:
       case Xsplash_e:
       case Xsplash_w:
-       cave[x][y] = Zplayer;
-       next[x][y] = Zplayer;
       case Xfake_acid_1:
       case Xfake_acid_2:
       case Xfake_acid_3:
@@ -521,13 +608,15 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xfake_acid_6:
       case Xfake_acid_7:
       case Xfake_acid_8:
+       cave[x][y] = add_player[element];
+       next[x][y] = add_player[element];
+
        play_element_sound(x, y, SOUND_blank, Xblank);
        ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
-#ifdef USE_CHANGED_ACID_STUFF
       case Xacid_1:
       case Xacid_2:
       case Xacid_3:
@@ -536,13 +625,14 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xacid_6:
       case Xacid_7:
       case Xacid_8:
+#ifdef ACID_PLAYER
        if (cave[x+1][y-1] == Xblank)
          cave[x+1][y-1] = Xsplash_e;
        if (cave[x-1][y-1] == Xblank)
          cave[x-1][y-1] = Xsplash_w;
        play_element_sound(x, y, SOUND_acid, Xacid_1);
+       // FALL THROUGH
 #endif
-
       case Xboom_android:
       case Xboom_1:
       case Xbug_1_n:
@@ -561,17 +651,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xtank_2_e:
       case Xtank_2_s:
       case Xtank_2_w:
-
-#ifndef USE_CHANGED_ACID_STUFF
-      case Xacid_1:
-      case Xacid_2:
-      case Xacid_3:
-      case Xacid_4:
-      case Xacid_5:
-      case Xacid_6:
-      case Xacid_7:
-      case Xacid_8:
-#endif
        ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
@@ -1083,11 +1162,10 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
        if (!is_blank[cave[x+dx][y+dy]])
          break;
 
-       if (!is_fake_acid[cave[x+dx][y+dy]])
-       {
-         cave[x+dx][y+dy] = Zplayer;
-         next[x+dx][y+dy] = Zplayer;
-       }
+       int element_next = cave[x+dx][y+dy];
+
+       cave[x+dx][y+dy] = add_player[element_next];
+       next[x+dx][y+dy] = add_player[element_next];
 
        play_element_sound(x, y, SOUND_door, element);
        ply->anim = PLY_walk_n + anim;
@@ -1136,7 +1214,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xswitch:
        play_element_sound(x, y, SOUND_press, element);
        lev.ball_cnt = lev.ball_time;
-       lev.ball_state = !lev.ball_state;
+       lev.ball_active = !lev.ball_active;
        break;
 
       case Xplant:
@@ -1290,6 +1368,11 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
     }
   }
 
+  /* check for wrap-around movement */
+  if (ply->x < lev.left ||
+      ply->x > lev.right - 1)
+    play_element_sound(oldx, oldy, SOUND_door, Xdoor_1);
+
   return result;
 }
 
@@ -1357,7 +1440,10 @@ static void check_player(struct PLAYER *ply)
 
     if (!can_move)
     {
-      ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
+      ply->joy_n = FALSE;
+      ply->joy_e = FALSE;
+      ply->joy_s = FALSE;
+      ply->joy_w = FALSE;
 
       return;
     }
@@ -1365,7 +1451,7 @@ static void check_player(struct PLAYER *ply)
 
   if (dx == 0 && dy == 0)
   {
-    ply->joy_stick = 0;
+    ply->joy_stick = FALSE;
 
     if (ply->joy_drop)
     {
@@ -1387,12 +1473,15 @@ static void check_player(struct PLAYER *ply)
     return;
   }
 
-  ply->joy_stick = 1;
-  ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
+  ply->joy_stick = TRUE;
+  ply->joy_n = FALSE;
+  ply->joy_e = FALSE;
+  ply->joy_s = FALSE;
+  ply->joy_w = FALSE;
+
   ply->dynamite_cnt = 0;       /* reset dynamite timer if we move */
-  ply->joy_spin = !ply->joy_spin;
 
-  if (ply->joy_snap == 0)              /* player wants to move */
+  if (!ply->joy_snap)          /* player wants to move */
   {
     boolean moved = FALSE;
 
@@ -1537,14 +1626,14 @@ static void Landroid(int x, int y)
 
   if (lev.android_clone_cnt == 0)
   {
-    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]])
+    if (!is_android_blank[cave[x-1][y-1]] &&
+       !is_android_blank[cave[x][y-1]]   &&
+       !is_android_blank[cave[x+1][y-1]] &&
+       !is_android_blank[cave[x-1][y]]   &&
+       !is_android_blank[cave[x+1][y]]   &&
+       !is_android_blank[cave[x-1][y+1]] &&
+       !is_android_blank[cave[x][y+1]]   &&
+       !is_android_blank[cave[x+1][y+1]])
       goto android_move;
 
     switch (RANDOM(8))
@@ -1648,91 +1737,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 (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;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
        goto android_move;
 
       case 1: /* NW,SE,N,S,NE,SW,E,W */
-       if (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;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
        goto android_move;
 
       case 2: /* SW,E,S,W,N,NW,SE,NE */
-       if (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;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
        goto android_move;
 
       case 3: /* N,SE,NE,E,W,S,NW,SW */
-       if (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;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
        goto android_move;
 
       case 4: /* SE,NW,E,NE,SW,W,N,S */
-       if (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;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
        goto android_move;
 
       case 5: /* NE,W,SE,SW,S,N,E,NW */
-       if (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;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
        goto android_move;
 
       case 6: /* E,N,SW,S,NW,NE,SE,W */
-       if (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;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
        goto android_move;
 
       case 7: /* W,SW,NW,N,E,SE,NE,S */
-       if (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;
+       if (is_android_blank[cave[x-1][y]])   goto android_w;
+       if (is_android_blank[cave[x-1][y+1]]) goto android_sw;
+       if (is_android_blank[cave[x-1][y-1]]) goto android_nw;
+       if (is_android_blank[cave[x][y-1]])   goto android_n;
+       if (is_android_blank[cave[x+1][y]])   goto android_e;
+       if (is_android_blank[cave[x+1][y+1]]) goto android_se;
+       if (is_android_blank[cave[x+1][y-1]]) goto android_ne;
+       if (is_android_blank[cave[x][y+1]])   goto android_s;
        goto android_move;
     }
   }
@@ -1740,14 +1829,14 @@ static void Landroid(int x, int y)
  android_move:
   if (lev.android_move_cnt == 0)
   {
-    if (cave[x-1][y-1] == Zplayer ||
-       cave[x][y-1]   == Zplayer ||
-       cave[x+1][y-1] == Zplayer ||
-       cave[x-1][y]   == Zplayer ||
-       cave[x+1][y]   == Zplayer ||
-       cave[x-1][y+1] == Zplayer ||
-       cave[x][y+1]   == Zplayer ||
-       cave[x+1][y+1] == Zplayer)
+    if (is_player[cave[x-1][y-1]] ||
+       is_player[cave[x][y-1]]   ||
+       is_player[cave[x+1][y-1]] ||
+       is_player[cave[x-1][y]]   ||
+       is_player[cave[x+1][y]]   ||
+       is_player[cave[x-1][y+1]] ||
+       is_player[cave[x][y+1]]   ||
+       is_player[cave[x+1][y+1]])
       goto android_still;
 
     set_nearest_player_xy(x, y, &dx, &dy);
@@ -2342,6 +2431,14 @@ static void Leater_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Yeater_nB;
@@ -2422,6 +2519,14 @@ static void Leater_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Yeater_eB;
@@ -2502,6 +2607,14 @@ static void Leater_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Yeater_sB;
@@ -2582,6 +2695,14 @@ static void Leater_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Yeater_wB;
@@ -2646,6 +2767,14 @@ static void Lalien(int x, int y)
        case Xfake_acid_6:
        case Xfake_acid_7:
        case Xfake_acid_8:
+       case Xfake_acid_1_player:
+       case Xfake_acid_2_player:
+       case Xfake_acid_3_player:
+       case Xfake_acid_4_player:
+       case Xfake_acid_5_player:
+       case Xfake_acid_6_player:
+       case Xfake_acid_7_player:
+       case Xfake_acid_8_player:
        case Xplant:
        case Yplant:
          cave[x][y] = Yalien_nB;
@@ -2689,6 +2818,14 @@ static void Lalien(int x, int y)
        case Xfake_acid_6:
        case Xfake_acid_7:
        case Xfake_acid_8:
+       case Xfake_acid_1_player:
+       case Xfake_acid_2_player:
+       case Xfake_acid_3_player:
+       case Xfake_acid_4_player:
+       case Xfake_acid_5_player:
+       case Xfake_acid_6_player:
+       case Xfake_acid_7_player:
+       case Xfake_acid_8_player:
        case Xplant:
        case Yplant:
          cave[x][y] = Yalien_sB;
@@ -2735,6 +2872,14 @@ static void Lalien(int x, int y)
        case Xfake_acid_6:
        case Xfake_acid_7:
        case Xfake_acid_8:
+       case Xfake_acid_1_player:
+       case Xfake_acid_2_player:
+       case Xfake_acid_3_player:
+       case Xfake_acid_4_player:
+       case Xfake_acid_5_player:
+       case Xfake_acid_6_player:
+       case Xfake_acid_7_player:
+       case Xfake_acid_8_player:
        case Xplant:
        case Yplant:
          cave[x][y] = Yalien_eB;
@@ -2778,6 +2923,14 @@ static void Lalien(int x, int y)
        case Xfake_acid_6:
        case Xfake_acid_7:
        case Xfake_acid_8:
+       case Xfake_acid_1_player:
+       case Xfake_acid_2_player:
+       case Xfake_acid_3_player:
+       case Xfake_acid_4_player:
+       case Xfake_acid_5_player:
+       case Xfake_acid_6_player:
+       case Xfake_acid_7_player:
+       case Xfake_acid_8_player:
        case Xplant:
        case Yplant:
          cave[x][y] = Yalien_wB;
@@ -2829,6 +2982,14 @@ static void Lbug_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Ybug_nB;
@@ -2890,6 +3051,14 @@ static void Lbug_1_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -2943,6 +3112,14 @@ static void Lbug_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Ybug_eB;
@@ -3004,6 +3181,14 @@ static void Lbug_1_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3057,6 +3242,14 @@ static void Lbug_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Ybug_sB;
@@ -3118,6 +3311,14 @@ static void Lbug_1_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3171,6 +3372,14 @@ static void Lbug_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Ybug_wB;
@@ -3232,6 +3441,14 @@ static void Lbug_1_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3285,6 +3502,14 @@ static void Ltank_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Ytank_nB;
@@ -3346,6 +3571,14 @@ static void Ltank_1_n(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3399,6 +3632,14 @@ static void Ltank_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Ytank_eB;
@@ -3460,6 +3701,14 @@ static void Ltank_1_e(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3513,6 +3762,14 @@ static void Ltank_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Ytank_sB;
@@ -3574,6 +3831,14 @@ static void Ltank_1_s(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3627,6 +3892,14 @@ static void Ltank_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Ytank_wB;
@@ -3688,6 +3961,14 @@ static void Ltank_1_w(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
     case Xacid_1:
@@ -3938,6 +4219,14 @@ static void Lemerald_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
       cave[x][y] = Yemerald_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yemerald_s;
@@ -3962,9 +4251,9 @@ static void Lemerald_fall(int x, int y)
       return;
 
     case Xwonderwall:
-      if (lev.wonderwall_time)
+      if (lev.wonderwall_time > 0)
       {
-       lev.wonderwall_state = 1;
+       lev.wonderwall_active = TRUE;
        cave[x][y] = Yemerald_sB;
        next[x][y] = Xblank;
        if (is_blank[cave[x][y+2]])
@@ -4197,6 +4486,14 @@ static void Ldiamond_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
       cave[x][y] = Ydiamond_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ydiamond_s;
@@ -4221,9 +4518,9 @@ static void Ldiamond_fall(int x, int y)
       return;
 
     case Xwonderwall:
-      if (lev.wonderwall_time)
+      if (lev.wonderwall_time > 0)
       {
-       lev.wonderwall_state = 1;
+       lev.wonderwall_active = TRUE;
        cave[x][y] = Ydiamond_sB;
        next[x][y] = Xblank;
        if (is_blank[cave[x][y+2]])
@@ -4449,6 +4746,14 @@ static void Lstone_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
       cave[x][y] = Ystone_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ystone_s;
@@ -4477,7 +4782,7 @@ static void Lstone_fall(int x, int y)
     case Xeater_s:
     case Xeater_w:
       cave[x][y] = Ystone_sB;
-      next[x][y] = Xblank;
+      Lboom_next_new(x, y, Xblank);
       cave[x][y+1] = Yeater_stone;
       next[x][y+1] = Zeater;
       Lboom_eater_old(x, y+1);
@@ -4487,7 +4792,7 @@ static void Lstone_fall(int x, int y)
     case Xalien:
     case Xalien_pause:
       cave[x][y] = Ystone_sB;
-      next[x][y] = Xblank;
+      Lboom_next_new(x, y, Xblank);
       cave[x][y+1] = Yalien_stone;
       next[x][y+1] = Ztank;
       Lboom_tank_old(x, y+1);
@@ -4503,7 +4808,7 @@ static void Lstone_fall(int x, int y)
     case Xbug_2_s:
     case Xbug_2_w:
       cave[x][y] = Ystone_sB;
-      next[x][y] = Xblank;
+      Lboom_next_new(x, y, Xblank);
       cave[x][y+1] = Ybug_stone;
       next[x][y+1] = Zbug;
       Lboom_bug_old(x, y+1);
@@ -4519,7 +4824,7 @@ static void Lstone_fall(int x, int y)
     case Xtank_2_s:
     case Xtank_2_w:
       cave[x][y] = Ystone_sB;
-      next[x][y] = Xblank;
+      Lboom_next_new(x, y, Xblank);
       cave[x][y+1] = Ytank_stone;
       next[x][y+1] = Ztank;
       Lboom_tank_old(x, y+1);
@@ -4542,6 +4847,14 @@ static void Lstone_fall(int x, int y)
        case Xfake_acid_6:
        case Xfake_acid_7:
        case Xfake_acid_8:
+       case Xfake_acid_1_player:
+       case Xfake_acid_2_player:
+       case Xfake_acid_3_player:
+       case Xfake_acid_4_player:
+       case Xfake_acid_5_player:
+       case Xfake_acid_6_player:
+       case Xfake_acid_7_player:
+       case Xfake_acid_8_player:
        case Xplant:
        case Yplant:
        case Xacid_1:
@@ -4598,8 +4911,8 @@ static void Lstone_fall(int x, int y)
 
     case Xbomb:
     case Xbomb_pause:
-      cave[x][y] = Xstone;
-      next[x][y] = Xstone;
+      Lboom_cave_new(x, y, Xstone);
+      Lboom_next_new(x, y, Xstone);
       cave[x][y+1] = Ybomb_blank;
       next[x][y+1] = Ztank;
       Lboom_tank_old(x, y+1);
@@ -4669,9 +4982,9 @@ static void Lstone_fall(int x, int y)
       return;
 
     case Xwonderwall:
-      if (lev.wonderwall_time)
+      if (lev.wonderwall_time > 0)
       {
-       lev.wonderwall_state = 1;
+       lev.wonderwall_active = TRUE;
        cave[x][y] = Ystone_sB;
        next[x][y] = Xblank;
        if (is_blank[cave[x][y+2]])
@@ -5111,6 +5424,14 @@ static void Lnut_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
       cave[x][y] = Ynut_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Ynut_s;
@@ -5577,6 +5898,14 @@ static void Lspring_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
       cave[x][y] = Yspring_sB;
       next[x][y] = Xblank;
       cave[x][y+1] = Yspring_s;
@@ -5678,6 +6007,9 @@ static void Lpush_emerald_e(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -5689,6 +6021,7 @@ static void Lpush_emerald_e(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xemerald);
       return;
 
 #ifdef ACID_ROLL
@@ -5700,6 +6033,8 @@ static void Lpush_emerald_e(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x+2][y-1] == Xblank)
        cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
@@ -5720,6 +6055,9 @@ static void Lpush_emerald_w(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -5731,6 +6069,7 @@ static void Lpush_emerald_w(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xemerald);
       return;
 
 #ifdef ACID_ROLL
@@ -5742,6 +6081,8 @@ static void Lpush_emerald_w(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x][y-1] == Xblank)
        cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
@@ -5762,6 +6103,9 @@ static void Lpush_diamond_e(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -5773,6 +6117,7 @@ static void Lpush_diamond_e(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xdiamond);
       return;
 
 #ifdef ACID_ROLL
@@ -5784,6 +6129,8 @@ static void Lpush_diamond_e(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x+2][y-1] == Xblank)
        cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
@@ -5804,6 +6151,9 @@ static void Lpush_diamond_w(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -5815,6 +6165,7 @@ static void Lpush_diamond_w(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xdiamond);
       return;
 
 #ifdef ACID_ROLL
@@ -5826,6 +6177,8 @@ static void Lpush_diamond_w(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x][y-1] == Xblank)
        cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
@@ -5846,6 +6199,9 @@ static void Lpush_stone_e(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -5857,6 +6213,7 @@ static void Lpush_stone_e(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xstone);
       return;
 
 #ifdef ACID_ROLL
@@ -5868,6 +6225,8 @@ static void Lpush_stone_e(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x+2][y-1] == Xblank)
        cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
@@ -5888,6 +6247,9 @@ static void Lpush_stone_w(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -5899,6 +6261,7 @@ static void Lpush_stone_w(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xstone);
       return;
 
 #ifdef ACID_ROLL
@@ -5910,6 +6273,8 @@ static void Lpush_stone_w(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x][y-1] == Xblank)
        cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
@@ -5930,6 +6295,9 @@ static void Lpush_bomb_e(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -5941,6 +6309,7 @@ static void Lpush_bomb_e(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xbomb);
       return;
 
 #ifdef ACID_ROLL
@@ -5952,6 +6321,8 @@ static void Lpush_bomb_e(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x+2][y-1] == Xblank)
        cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
@@ -5972,6 +6343,9 @@ static void Lpush_bomb_w(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -5983,6 +6357,7 @@ static void Lpush_bomb_w(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xbomb);
       return;
 
 #ifdef ACID_ROLL
@@ -5994,6 +6369,8 @@ static void Lpush_bomb_w(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x][y-1] == Xblank)
        cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
@@ -6014,6 +6391,9 @@ static void Lpush_nut_e(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -6025,6 +6405,7 @@ static void Lpush_nut_e(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xnut);
       return;
 
 #ifdef ACID_ROLL
@@ -6036,6 +6417,8 @@ static void Lpush_nut_e(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x+2][y-1] == Xblank)
        cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
@@ -6056,6 +6439,9 @@ static void Lpush_nut_w(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -6067,6 +6453,7 @@ static void Lpush_nut_w(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xnut);
       return;
 
 #ifdef ACID_ROLL
@@ -6078,6 +6465,8 @@ static void Lpush_nut_w(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x][y-1] == Xblank)
        cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
@@ -6098,6 +6487,9 @@ static void Lpush_spring_e(int x, int y)
 
   switch (cave[x+1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -6109,6 +6501,7 @@ static void Lpush_spring_e(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xspring);
       return;
 
 #ifdef ACID_ROLL
@@ -6120,6 +6513,8 @@ static void Lpush_spring_e(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x+2][y-1] == Xblank)
        cave[x+2][y-1] = Xsplash_e;
       if (cave[x][y-1] == Xblank)
@@ -6140,6 +6535,9 @@ static void Lpush_spring_w(int x, int y)
 
   switch (cave[x-1][y])
   {
+    case Zplayer:
+      if (!game_em.use_old_push_elements)
+       break;
     case Zborder:
     case Zbug:
     case Ztank:
@@ -6151,6 +6549,7 @@ static void Lpush_spring_w(int x, int y)
     case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
+      Lpush_element_old(x, y, Xspring);
       return;
 
 #ifdef ACID_ROLL
@@ -6162,6 +6561,8 @@ static void Lpush_spring_w(int x, int y)
     case Xacid_6:
     case Xacid_7:
     case Xacid_8:
+      if (game_em.use_old_push_into_acid)
+       break;
       if (cave[x][y-1] == Xblank)
        cave[x][y-1] = Xsplash_e;
       if (cave[x-2][y-1] == Xblank)
@@ -6559,7 +6960,7 @@ static void Lball_common(int x, int y)
 
 static void Lball_1(int x, int y)
 {
-  if (lev.ball_state == 0)
+  if (!lev.ball_active)
     return;
 
   cave[x][y] = Yball_1;
@@ -6572,7 +6973,7 @@ static void Lball_1(int x, int y)
 
 static void Lball_2(int x, int y)
 {
-  if (lev.ball_state == 0)
+  if (!lev.ball_active)
     return;
 
   cave[x][y] = Yball_2;
@@ -6606,6 +7007,14 @@ static void Ldrip_fall(int x, int y)
     case Xfake_acid_6:
     case Xfake_acid_7:
     case Xfake_acid_8:
+    case Xfake_acid_1_player:
+    case Xfake_acid_2_player:
+    case Xfake_acid_3_player:
+    case Xfake_acid_4_player:
+    case Xfake_acid_5_player:
+    case Xfake_acid_6_player:
+    case Xfake_acid_7_player:
+    case Xfake_acid_8_player:
     case Xplant:
     case Yplant:
       cave[x][y] = Ydrip_1_sB;
@@ -6665,7 +7074,7 @@ static void Ldrip_stretchB(int x, int y)
 
 static void Lwonderwall(int x, int y)
 {
-  if (lev.wonderwall_time && lev.wonderwall_state)
+  if (lev.wonderwall_time > 0 && lev.wonderwall_active)
   {
     cave[x][y] = Ywonderwall;
     play_element_sound(x, y, SOUND_wonder, Xwonderwall);
@@ -6680,7 +7089,7 @@ static void Lwheel(int x, int y)
 
 static void Lswitch(int x, int y)
 {
-  if (lev.ball_state)
+  if (lev.ball_active)
     cave[x][y] = Yswitch;
 }
 
@@ -7267,44 +7676,75 @@ static void handle_tile(int x, int y)
   }
 }
 
-static void logic_players(void)
+boolean logic_check_wrap(void)
 {
-  int start_check_nr;
   int i;
 
-  cave = lev.cave;
-  next = lev.next;
-  boom = lev.boom;
-
-  game_em.any_player_moving = FALSE;
-  game_em.any_player_snapping = FALSE;
-
-  /* must test for death and actually kill separately */
   for (i = 0; i < MAX_PLAYERS; i++)
   {
-    boolean ply_kill = player_killed(&ply[i]);
+    if (!ply[i].alive)
+      continue;
 
-    if (ply[i].alive && ply_kill)
-      kill_player(&ply[i]);
+    /* check for wrap-around movement */
+    if (ply[i].x < lev.left ||
+       ply[i].x > lev.right - 1)
+      return TRUE;
   }
 
+  return FALSE;
+}
+
+void logic_move(void)
+{
+  int i;
+
   for (i = 0; i < MAX_PLAYERS; i++)
   {
+    if (!ply[i].alive)
+      continue;
+
     /* check for wrap-around movement */
     if (ply[i].x < lev.left ||
        ply[i].x > lev.right - 1)
     {
       ply[i].x = (ply[i].x < lev.left ? lev.right - 1 : lev.left);
 
+      if (!lev.infinite_true)
+       ply[i].y += (ply[i].x == lev.left ? 1 : -1);
+
       game.centered_player_nr_next = i;
       game.set_centered_player = TRUE;
-      game.set_centered_player_fast = TRUE;
+      game.set_centered_player_wrap = TRUE;
     }
 
-    ply[i].oldx = ply[i].x;
-    ply[i].oldy = ply[i].y;
+    ply[i].prev_x = ply[i].x;
+    ply[i].prev_y = ply[i].y;
     ply[i].anim = PLY_still;
   }
+}
+
+static void logic_players(void)
+{
+  int start_check_nr;
+  int i;
+
+  cave = lev.cave;
+  next = lev.next;
+  boom = lev.boom;
+
+  game_em.any_player_moving = FALSE;
+  game_em.any_player_snapping = FALSE;
+
+  /* must test for death and actually kill separately */
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    boolean ply_kill = player_killed(&ply[i]);
+
+    if (ply[i].alive && ply_kill)
+      kill_player(&ply[i]);
+  }
+
+  logic_move();
 
   start_check_nr = ((game_em.random & 128 ? 0 : 1) * 2 +
                    (game_em.random & 256 ? 0 : 1));
@@ -7322,16 +7762,20 @@ static void logic_players(void)
     if (!ply[i].alive)
       continue;
 
-    if (cave[ply[i].oldx][ply[i].oldy] == Zplayer)
+    if (is_player[cave[ply[i].prev_x][ply[i].prev_y]])
     {
-      cave[ply[i].oldx][ply[i].oldy] = Xblank;
-      next[ply[i].oldx][ply[i].oldy] = Xblank;
+      int element = cave[ply[i].prev_x][ply[i].prev_y];
+
+      cave[ply[i].prev_x][ply[i].prev_y] = remove_player[element];
+      next[ply[i].prev_x][ply[i].prev_y] = remove_player[element];
     }
 
-    if (cave[ply[i].x][ply[i].y] == Xblank)
+    if (is_blank[cave[ply[i].x][ply[i].y]])
     {
-      cave[ply[i].x][ply[i].y] = Zplayer;
-      next[ply[i].x][ply[i].y] = Zplayer;
+      int element = cave[ply[i].x][ply[i].y];
+
+      cave[ply[i].x][ply[i].y] = add_player[element];
+      next[ply[i].x][ply[i].y] = add_player[element];
     }
   }
 }
@@ -7370,7 +7814,11 @@ static void logic_globals(void)
   int x;
   int y;
   int count;
-  unsigned int random;
+#ifdef RANDOM_BUG
+  uint64_t random;
+#else
+  uint32_t random;
+#endif
 
   cave = lev.cave;
   next = lev.next;
@@ -7385,7 +7833,7 @@ static void logic_globals(void)
     lev.android_move_cnt = lev.android_move_time;
   if (lev.android_clone_cnt-- == 0)
     lev.android_clone_cnt = lev.android_clone_time;
-  if (lev.ball_state)
+  if (lev.ball_active)
     if (lev.ball_cnt-- == 0)
       lev.ball_cnt = lev.ball_time;
   if (lev.lenses_cnt)
@@ -7396,7 +7844,7 @@ static void logic_globals(void)
     lev.wheel_cnt--;
   if (lev.wind_cnt)
     lev.wind_cnt--;
-  if (lev.wonderwall_time && lev.wonderwall_state)
+  if (lev.wonderwall_time > 0 && lev.wonderwall_active)
     lev.wonderwall_time--;
 
   if (lev.wheel_cnt)
@@ -7416,6 +7864,11 @@ static void logic_globals(void)
       Lamoeba(x, y);
 
     random = random * 129 + 1;
+
+#ifdef RANDOM_BUG
+    if (!game_em.use_random_bug)
+      random = (uint32_t)random;
+#endif
   }
 
   game_em.random = random;
@@ -7433,6 +7886,14 @@ static void logic_globals(void)
       next[x][y] = cave[x][y];
 }
 
+void logic_init(void)
+{
+  int splash_is_blank = !game_em.use_old_android;
+
+  is_android_blank[Xsplash_e] = splash_is_blank;
+  is_android_blank[Xsplash_w] = splash_is_blank;
+}
+
 void logic(void)
 {
   if (frame == 0)