X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_2.c;h=5079b7c253d7b31a8339f97aaf0b1b67bb99d46c;hb=88c9b68c44a16e7df62557b63cc7e86731e028c9;hp=685672357a55abce8deed33db81d8739e7f717c5;hpb=c5321d9d36d0a74062651d0352fbbaccbe125eca;p=rocksndiamonds.git

diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c
index 68567235..5079b7c2 100644
--- a/src/game_em/synchro_2.c
+++ b/src/game_em/synchro_2.c
@@ -15,28 +15,51 @@
 
 
 #define RANDOM (random = random << 31 | random >> 1)
-#define PLAY(sample) { if ((unsigned int)(y - top) <= 12 && (unsigned int)(x - left) <= 20) play[sample] = 1; }
 
-extern unsigned int screen_x;
-extern unsigned int screen_y;
+static void set_nearest_player_xy(int x, int y, int *dx, int *dy)
+{
+  int distance, distance_shortest = EM_MAX_CAVE_WIDTH + EM_MAX_CAVE_HEIGHT;
+  int i;
+
+  /* default values if no players are alive anymore */
+  *dx = 0;
+  *dy = 0;
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    if (!ply[i].alive)
+      continue;
+
+    distance = ABS(ply[i].x - x) + ABS(ply[i].y - y);
+
+    if (distance < distance_shortest)
+    {
+      *dx = ply[i].x;
+      *dy = ply[i].y;
+
+      distance_shortest = distance;
+    }
+  }
+}
 
 void synchro_2(void)
 {
   register unsigned int x = 0;
   register unsigned int y = 1;
-  register unsigned long random = Random;
+  register unsigned long random = RandomEM;
   register unsigned short *cave_cache = Cave[y]; /* might be a win */
   unsigned long score = 0;
 
   unsigned int temp = 0;	/* initialized to make compilers happy */
-  unsigned int left = screen_x / TILEX; /* only needed for sounds */
-  unsigned int top = screen_y / TILEY;
   unsigned int dx; /* only needed to find closest player */
   unsigned int dy;
+  int element;
 
  loop:
 
-  switch (cave_cache[++x])
+  element = cave_cache[++x];
+
+  switch (element)
   {
     default:
       goto loop;
@@ -351,7 +374,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -359,6 +382,16 @@ void synchro_2(void)
   	case Yacid_splash_wB:
   	case Xplant:
   	case Yplant:
+#if 1
+        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
   	  Cave[y][x] = Ystone_sB;
   	  Cave[y+1][x] = Ystone_s;
   	  Next[y][x] = Xblank;
@@ -482,12 +515,22 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
   	case Yacid_splash_eB:
   	case Yacid_splash_wB:
+#if 1
+        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
   	  Cave[y][x] = Ystone_sB;
   	  Cave[y+1][x] = Ystone_s;
   	  Next[y][x] = Xblank;
@@ -519,13 +562,23 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
   	case Yacid_splash_eB:
   	case Yacid_splash_wB:
   	case Zplayer:
+#if 1
+        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
   	  Cave[y][x] = Ystone_sB;
   	  Cave[y+1][x] = Ystone_s;
   	  Next[y][x] = Xblank;
@@ -537,7 +590,7 @@ void synchro_2(void)
   	  Cave[y+1][x] = Yemerald_stone;
   	  Next[y][x] = Xstone;
   	  Next[y+1][x] = Xemerald;
-  	  play[SAMPLE_crack] = 1;
+  	  play_element_sound(x, y, SAMPLE_crack, Xnut);
   	  score += lev.nut_score;
   	  goto loop;
 
@@ -561,6 +614,9 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xemerald;
   	  Boom[y+2][x] = Xemerald;
   	  Boom[y+2][x+1] = Xemerald;
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  score += lev.bug_score;
   	  goto loop;
 
@@ -584,6 +640,9 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  score += lev.tank_score;
   	  goto loop;
 
@@ -641,6 +700,9 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = lev.eater_array[lev.eater_pos][6];
   	  Boom[y+2][x] = lev.eater_array[lev.eater_pos][7];
   	  Boom[y+2][x+1] = lev.eater_array[lev.eater_pos][8];
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  lev.eater_pos = (lev.eater_pos + 1) & 7;
   	  score += lev.eater_score;
   	  goto loop;
@@ -659,6 +721,9 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  score += lev.alien_score;
   	  goto loop;
 
@@ -713,7 +778,7 @@ void synchro_2(void)
   	    case Xplant:
   	    case Yplant:
   	      Next[y][x] = Xstone;
-  	      PLAY(SAMPLE_stone);
+  	      play_element_sound(x, y, SAMPLE_stone, Xstone);
   	      goto loop;
   	  }
 
@@ -721,7 +786,7 @@ void synchro_2(void)
   	  Cave[y+1][x] = Ydiamond_stone;
   	  Next[y][x] = Xblank;
   	  Next[y+1][x] = Xstone_pause;
-  	  play[SAMPLE_squash] = 1;
+  	  play_element_sound(x, y, SAMPLE_squash, Xdiamond);
   	  goto loop;
 
   	case Xbomb:
@@ -737,6 +802,9 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  goto loop;
 
   	case Xwonderwall:
@@ -752,14 +820,14 @@ void synchro_2(void)
   	    }
 
   	    Next[y][x] = Xblank;
-  	    play[SAMPLE_squash] = 1;
+  	    play_element_sound(x, y, SAMPLE_wonderfall, Xwonderwall);
   	    goto loop;
   	  }
 
   	default:
   	  Cave[y][x] = Xstone;
   	  Next[y][x] = Xstone;
-  	  PLAY(SAMPLE_stone);
+  	  play_element_sound(x, y, SAMPLE_stone, Xstone);
   	  goto loop;
       }
 
@@ -782,7 +850,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -903,7 +971,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -940,7 +1008,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -956,17 +1024,17 @@ void synchro_2(void)
   	default:
   	  Cave[y][x] = Xnut;
   	  Next[y][x] = Xnut;
-  	  PLAY(SAMPLE_nut);
+  	  play_element_sound(x, y, SAMPLE_nut, Xnut);
   	  goto loop;
       }
 
     /* --------------------------------------------------------------------- */
 
     case Xbug_n:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto bug_boom;
 
       switch (Cave[y][x+1])
@@ -987,7 +1055,7 @@ void synchro_2(void)
   	case Zplayer:
   	  Cave[y][x] = Ybug_n_e;
   	  Next[y][x] = Xbug_goe;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
 
   	default:
@@ -995,10 +1063,10 @@ void synchro_2(void)
   	}
 
     case Xbug_gon:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto bug_boom;
 
     bug_gon:
@@ -1019,7 +1087,7 @@ void synchro_2(void)
   	  if (Cave[y-2][x-1] == Xblank)
 	    Cave[y-2][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -1032,23 +1100,23 @@ void synchro_2(void)
   	  Cave[y-1][x] = Ybug_n;
   	  Next[y][x] = Xblank;
   	  Next[y-1][x] = Xbug_n;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Ybug_n_w;
   	  Next[y][x] = Xbug_gow;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
       }
 
     /* --------------------------------------------------------------------- */
 
     case Xbug_e:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto bug_boom;
 
       switch (Cave[y+1][x])
@@ -1069,7 +1137,7 @@ void synchro_2(void)
   	case Zplayer:
   	  Cave[y][x] = Ybug_e_s;
   	  Next[y][x] = Xbug_gos;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
 
   	default:
@@ -1077,10 +1145,10 @@ void synchro_2(void)
       }
 
     case Xbug_goe:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto bug_boom;
 
     bug_goe:
@@ -1101,7 +1169,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x] == Xblank)
 	    Cave[y-1][x] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -1114,23 +1182,23 @@ void synchro_2(void)
   	  Cave[y][x+1] = Ybug_e;
   	  Next[y][x] = Xblank;
   	  Next[y][x+1] = Xbug_e;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Ybug_e_n;
   	  Next[y][x] = Xbug_gon;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
       }
 
     /* --------------------------------------------------------------------- */
 
     case Xbug_s:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto bug_boom;
 
       switch (Cave[y][x-1])
@@ -1151,7 +1219,7 @@ void synchro_2(void)
   	case Zplayer:
   	  Cave[y][x] = Ybug_s_w;
   	  Next[y][x] = Xbug_gow;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
 
   	default:
@@ -1159,10 +1227,10 @@ void synchro_2(void)
       }
 
     case Xbug_gos:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto bug_boom;
 
     bug_gos:
@@ -1183,7 +1251,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -1196,23 +1264,23 @@ void synchro_2(void)
   	  Cave[y+1][x] = Ybug_s;
   	  Next[y][x] = Xblank;
   	  Next[y+1][x] = Xbug_s;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Ybug_s_e;
   	  Next[y][x] = Xbug_goe;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
       }
 
     /* --------------------------------------------------------------------- */
 
     case Xbug_w:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto bug_boom;
 
       switch (Cave[y-1][x])
@@ -1233,7 +1301,7 @@ void synchro_2(void)
   	case Zplayer:
   	  Cave[y][x] = Ybug_w_n;
   	  Next[y][x] = Xbug_gon;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
 
   	default:
@@ -1241,10 +1309,10 @@ void synchro_2(void)
       }
 
     case Xbug_gow:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto bug_boom;
 
     bug_gow:
@@ -1265,7 +1333,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x-2] == Xblank)
 	    Cave[y-1][x-2] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -1278,23 +1346,23 @@ void synchro_2(void)
   	  Cave[y][x-1] = Ybug_w;
   	  Next[y][x] = Xblank;
   	  Next[y][x-1] = Xbug_w;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Ybug_w_s;
   	  Next[y][x] = Xbug_gos;
-  	  PLAY(SAMPLE_bug);
+  	  play_element_sound(x, y, SAMPLE_bug, element);
   	  goto loop;
       }
 
     /* --------------------------------------------------------------------- */
 
     case Xtank_n:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto tank_boom;
 
       switch (Cave[y][x-1])
@@ -1315,7 +1383,7 @@ void synchro_2(void)
   	case Zplayer:
   	  Cave[y][x] = Ytank_n_w;
   	  Next[y][x] = Xtank_gow;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
 
   	default:
@@ -1323,10 +1391,10 @@ void synchro_2(void)
       }
 
     case Xtank_gon:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto tank_boom;
 
     tank_gon:
@@ -1347,7 +1415,7 @@ void synchro_2(void)
   	  if (Cave[y-2][x-1] == Xblank)
 	    Cave[y-2][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -1360,23 +1428,23 @@ void synchro_2(void)
   	  Cave[y-1][x] = Ytank_n;
   	  Next[y][x] = Xblank;
   	  Next[y-1][x] = Xtank_n;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Ytank_n_e;
   	  Next[y][x] = Xtank_goe;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
       }
 
     /* --------------------------------------------------------------------- */
 
     case Xtank_e:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto tank_boom;
 
       switch (Cave[y-1][x])
@@ -1397,7 +1465,7 @@ void synchro_2(void)
   	case Zplayer:
   	  Cave[y][x] = Ytank_e_n;
   	  Next[y][x] = Xtank_gon;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
 
   	default:
@@ -1405,10 +1473,10 @@ void synchro_2(void)
       }
 
     case Xtank_goe:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto tank_boom;
 
     tank_goe:
@@ -1429,7 +1497,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x] == Xblank)
 	    Cave[y-1][x] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -1442,23 +1510,23 @@ void synchro_2(void)
   	  Cave[y][x+1] = Ytank_e;
   	  Next[y][x] = Xblank;
   	  Next[y][x+1] = Xtank_e;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Ytank_e_s;
   	  Next[y][x] = Xtank_gos;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
       }
 
     /* --------------------------------------------------------------------- */
 
     case Xtank_s:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto tank_boom;
 
       switch (Cave[y][x+1])
@@ -1479,7 +1547,7 @@ void synchro_2(void)
   	case Zplayer:
   	  Cave[y][x] = Ytank_s_e;
   	  Next[y][x] = Xtank_goe;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
 
   	default:
@@ -1487,10 +1555,10 @@ void synchro_2(void)
       }
 
     case Xtank_gos:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto tank_boom;
 
     tank_gos:
@@ -1511,7 +1579,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -1524,23 +1592,23 @@ void synchro_2(void)
   	  Cave[y+1][x] = Ytank_s;
   	  Next[y][x] = Xblank;
   	  Next[y+1][x] = Xtank_s;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Ytank_s_w;
   	  Next[y][x] = Xtank_gow;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
       }
 
     /* --------------------------------------------------------------------- */
 
     case Xtank_w:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto tank_boom;
 
       switch (Cave[y+1][x])
@@ -1561,7 +1629,7 @@ void synchro_2(void)
   	case Zplayer:
   	  Cave[y][x] = Ytank_w_s;
   	  Next[y][x] = Xtank_gos;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
 
   	default:
@@ -1569,10 +1637,10 @@ void synchro_2(void)
       }
 
     case Xtank_gow:
-      if (tab_ameuba[Cave[y-1][x]] ||
-	  tab_ameuba[Cave[y][x+1]] ||
-	  tab_ameuba[Cave[y+1][x]] ||
-	  tab_ameuba[Cave[y][x-1]])
+      if (tab_amoeba[Cave[y-1][x]] ||
+	  tab_amoeba[Cave[y][x+1]] ||
+	  tab_amoeba[Cave[y+1][x]] ||
+	  tab_amoeba[Cave[y][x-1]])
 	goto tank_boom;
 
     tank_gow:
@@ -1593,7 +1661,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x-2] == Xblank)
 	    Cave[y-1][x-2] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -1606,13 +1674,13 @@ void synchro_2(void)
   	  Cave[y][x-1] = Ytank_w;
   	  Next[y][x] = Xblank;
   	  Next[y][x-1] = Xtank_w;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Ytank_w_n;
   	  Next[y][x] = Xtank_gon;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_tank, element);
   	  goto loop;
       }
 
@@ -1727,8 +1795,8 @@ void synchro_2(void)
   	    goto android_move;
   	}
 
-  	Next[y][x] = temp; /* the item we chose to clone */
-  	play[SAMPLE_android] = 1;
+  	Next[y][x] = temp;	/* the item we chose to clone */
+  	play_element_sound(x, y, SAMPLE_android_clone, temp);
 
   	switch (RANDOM & 7)
 	{
@@ -1837,6 +1905,12 @@ void synchro_2(void)
 	    Cave[y+1][x+1] == Zplayer)
 	  goto android_still;
 
+#if 1
+
+	set_nearest_player_xy(x, y, &dx, &dy);
+
+#else
+
   	if (ply1.alive && ply2.alive)
 	{
   	  if ((ply1.x > x ? ply1.x - x : x - ply1.x) +
@@ -1869,7 +1943,9 @@ void synchro_2(void)
   	  dy = 0;
   	}
 
-  	Next[y][x] = Xblank; /* assume we will move */
+#endif
+
+  	Next[y][x] = Xblank;	/* assume we will move */
   	temp = ((x < dx) + 1 - (x > dx)) + ((y < dy) + 1 - (y > dy)) * 3;
 
   	if (RANDOM & 1)
@@ -2000,7 +2076,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_nB;
       Cave[y-1][x] = Yandroid_n;
       Next[y-1][x] = Xandroid;
-      PLAY(SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_ne:
@@ -2008,7 +2084,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_neB;
       Cave[y-1][x+1] = Yandroid_ne;
       Next[y-1][x+1] = Xandroid;
-      PLAY(SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_e:
@@ -2016,7 +2092,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_eB;
       Cave[y][x+1] = Yandroid_e;
       Next[y][x+1] = Xandroid;
-      PLAY(SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_se:
@@ -2024,7 +2100,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_seB;
       Cave[y+1][x+1] = Yandroid_se;
       Next[y+1][x+1] = Xandroid;
-      PLAY(SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_s:
@@ -2032,7 +2108,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_sB;
       Cave[y+1][x] = Yandroid_s;
       Next[y+1][x] = Xandroid;
-      PLAY(SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_sw:
@@ -2040,7 +2116,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_swB;
       Cave[y+1][x-1] = Yandroid_sw;
       Next[y+1][x-1] = Xandroid;
-      PLAY(SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_w:
@@ -2048,7 +2124,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_wB;
       Cave[y][x-1] = Yandroid_w;
       Next[y][x-1] = Xandroid;
-      PLAY(SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_nw:
@@ -2056,7 +2132,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_nwB;
       Cave[y-1][x-1] = Yandroid_nw;
       Next[y-1][x-1] = Xandroid;
-      PLAY(SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     /* --------------------------------------------------------------------- */
@@ -2078,7 +2154,7 @@ void synchro_2(void)
   	  if (Cave[y-2][x-1] == Xblank)
 	    Cave[y-2][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2088,7 +2164,7 @@ void synchro_2(void)
   	  Cave[y-1][x] = Yandroid_n;
   	  Next[y][x] = Xblank;
   	  Next[y-1][x] = Xandroid;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_android_move, element);
   	  goto loop;
 
   	default:
@@ -2112,7 +2188,7 @@ void synchro_2(void)
   	  if (Cave[y-2][x-1] == Xblank)
 	    Cave[y-2][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2122,7 +2198,7 @@ void synchro_2(void)
   	  Cave[y-1][x] = Yandroid_n;
   	  Next[y][x] = Xblank;
   	  Next[y-1][x] = Xandroid_1_n;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_android_move, element);
   	  goto loop;
 
   	default:
@@ -2148,7 +2224,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x] == Xblank)
 	    Cave[y-1][x] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2158,7 +2234,7 @@ void synchro_2(void)
   	  Cave[y][x+1] = Yandroid_e;
   	  Next[y][x] = Xblank;
   	  Next[y][x+1] = Xandroid;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_android_move, element);
   	  goto loop;
 
   	default:
@@ -2182,7 +2258,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x] == Xblank)
 	    Cave[y-1][x] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2192,7 +2268,7 @@ void synchro_2(void)
   	  Cave[y][x+1] = Yandroid_e;
   	  Next[y][x] = Xblank;
   	  Next[y][x+1] = Xandroid_1_e;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_android_move, element);
   	  goto loop;
 
   	default:
@@ -2218,7 +2294,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2228,7 +2304,7 @@ void synchro_2(void)
   	  Cave[y+1][x] = Yandroid_s;
   	  Next[y][x] = Xblank;
   	  Next[y+1][x] = Xandroid;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_android_move, element);
   	  goto loop;
 
   	default:
@@ -2252,7 +2328,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2262,7 +2338,7 @@ void synchro_2(void)
   	  Cave[y+1][x] = Yandroid_s;
   	  Next[y][x] = Xblank;
   	  Next[y+1][x] = Xandroid_1_s;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_android_move, element);
   	  goto loop;
 
   	default:
@@ -2288,7 +2364,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x-2] == Xblank)
 	    Cave[y-1][x-2] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2298,7 +2374,7 @@ void synchro_2(void)
   	  Cave[y][x-1] = Yandroid_w;
   	  Next[y][x] = Xblank;
   	  Next[y][x-1] = Xandroid;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_android_move, element);
   	  goto loop;
 
   	default:
@@ -2322,7 +2398,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x-2] == Xblank)
 	    Cave[y-1][x-2] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2332,7 +2408,7 @@ void synchro_2(void)
   	  Cave[y][x-1] = Yandroid_w;
   	  Next[y][x] = Xblank;
   	  Next[y][x-1] = Xandroid_1_w;
-  	  PLAY(SAMPLE_tank);
+  	  play_element_sound(x, y, SAMPLE_android_move, element);
   	  goto loop;
 
   	default:
@@ -2358,7 +2434,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2512,7 +2588,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2549,7 +2625,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2581,7 +2657,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x] == Xblank)
 	    Cave[y-1][x] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2607,7 +2683,7 @@ void synchro_2(void)
   	  Cave[y][x+1] = Yspring_kill_e;
   	  Next[y][x] = Xblank;
   	  Next[y][x+1] = Xspring_e;
-  	  play[SAMPLE_slurp] = 1;
+  	  play_element_sound(x, y, SAMPLE_slurp, Xalien);
   	  score += lev.slurp_score;
   	  goto loop;
 
@@ -2615,13 +2691,13 @@ void synchro_2(void)
   	case XbumperB:
   	  Cave[y][x+1] = XbumperB;
   	  Next[y][x] = Xspring_w;
-  	  PLAY(SAMPLE_spring);
+  	  play_element_sound(x, y, SAMPLE_spring, Xspring);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Xspring;
   	  Next[y][x] = Xspring;
-  	  PLAY(SAMPLE_spring);
+  	  play_element_sound(x, y, SAMPLE_spring, Xspring);
   	  goto loop;
       }
 
@@ -2644,7 +2720,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2676,7 +2752,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x-2] == Xblank)
 	    Cave[y-1][x-2] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2702,7 +2778,7 @@ void synchro_2(void)
   	  Cave[y][x-1] = Yspring_kill_w;
   	  Next[y][x] = Xblank;
   	  Next[y][x-1] = Xspring_w;
-  	  play[SAMPLE_slurp] = 1;
+  	  play_element_sound(x, y, SAMPLE_slurp, Xalien);
   	  score += lev.slurp_score;
   	  goto loop;
 
@@ -2710,13 +2786,13 @@ void synchro_2(void)
   	case XbumperB:
   	  Cave[y][x-1] = XbumperB;
   	  Next[y][x] = Xspring_e;
-  	  PLAY(SAMPLE_spring);
+  	  play_element_sound(x, y, SAMPLE_spring, Xspring);
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Xspring;
   	  Next[y][x] = Xspring;
-  	  PLAY(SAMPLE_spring);
+  	  play_element_sound(x, y, SAMPLE_spring, Xspring);
   	  goto loop;
       }
 
@@ -2739,7 +2815,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2765,6 +2841,9 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  goto loop;
 
   	case Xbug_n:
@@ -2787,6 +2866,9 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xemerald;
   	  Boom[y+2][x] = Xemerald;
   	  Boom[y+2][x+1] = Xemerald;
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  score += lev.bug_score;
   	  goto loop;
 
@@ -2810,6 +2892,9 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  score += lev.tank_score;
   	  goto loop;
 
@@ -2829,6 +2914,9 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = lev.eater_array[lev.eater_pos][6];
   	  Boom[y+2][x] = lev.eater_array[lev.eater_pos][7];
   	  Boom[y+2][x+1] = lev.eater_array[lev.eater_pos][8];
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  lev.eater_pos = (lev.eater_pos + 1) & 7;
   	  score += lev.eater_score;
   	  goto loop;
@@ -2847,13 +2935,16 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  score += lev.alien_score;
   	  goto loop;
 
   	default:
   	  Cave[y][x] = Xspring;
   	  Next[y][x] = Xspring;
-  	  PLAY(SAMPLE_spring);
+  	  play_element_sound(x, y, SAMPLE_spring, Xspring);
   	  goto loop;
       }
 
@@ -2864,7 +2955,7 @@ void synchro_2(void)
       {
 	Cave[y][x+1] = Ydiamond_eat;
 	Next[y][x+1] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -2872,7 +2963,7 @@ void synchro_2(void)
       {
 	Cave[y+1][x] = Ydiamond_eat;
 	Next[y+1][x] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -2880,7 +2971,7 @@ void synchro_2(void)
       {
 	Cave[y][x-1] = Ydiamond_eat;
 	Next[y][x-1] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -2888,7 +2979,7 @@ void synchro_2(void)
       {
 	Cave[y-1][x] = Ydiamond_eat;
 	Next[y-1][x] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -2908,7 +2999,7 @@ void synchro_2(void)
   	  if (Cave[y-2][x-1] == Xblank)
 	    Cave[y-2][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2925,7 +3016,7 @@ void synchro_2(void)
 
   	default:
   	  Next[y][x] = RANDOM & 1 ? Xeater_e : Xeater_w;
-  	  PLAY(SAMPLE_eater);
+  	  play_element_sound(x, y, SAMPLE_eater, element);
   	  goto loop;
       }
 
@@ -2936,7 +3027,7 @@ void synchro_2(void)
       {
 	Cave[y+1][x] = Ydiamond_eat;
 	Next[y+1][x] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -2944,7 +3035,7 @@ void synchro_2(void)
       {
 	Cave[y][x-1] = Ydiamond_eat;
 	Next[y][x-1] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -2952,7 +3043,7 @@ void synchro_2(void)
       {
 	Cave[y-1][x] = Ydiamond_eat;
 	Next[y-1][x] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -2960,7 +3051,7 @@ void synchro_2(void)
       {
 	Cave[y][x+1] = Ydiamond_eat;
 	Next[y][x+1] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -2980,7 +3071,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x] == Xblank)
 	    Cave[y-1][x] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -2997,7 +3088,7 @@ void synchro_2(void)
 
   	default:
   	  Next[y][x] = RANDOM & 1 ? Xeater_n : Xeater_s;
-  	  PLAY(SAMPLE_eater);
+  	  play_element_sound(x, y, SAMPLE_eater, element);
   	  goto loop;
       }
 
@@ -3008,7 +3099,7 @@ void synchro_2(void)
       {
 	Cave[y][x-1] = Ydiamond_eat;
 	Next[y][x-1] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -3016,7 +3107,7 @@ void synchro_2(void)
       {
 	Cave[y-1][x] = Ydiamond_eat;
 	Next[y-1][x] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -3024,7 +3115,7 @@ void synchro_2(void)
       {
 	Cave[y][x+1] = Ydiamond_eat;
 	Next[y][x+1] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -3032,7 +3123,7 @@ void synchro_2(void)
       {
 	Cave[y+1][x] = Ydiamond_eat;
 	Next[y+1][x] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -3052,7 +3143,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -3069,7 +3160,7 @@ void synchro_2(void)
 
   	default:
   	  Next[y][x] = RANDOM & 1 ? Xeater_e : Xeater_w;
-  	  PLAY(SAMPLE_eater);
+  	  play_element_sound(x, y, SAMPLE_eater, element);
   	  goto loop;
       }
 
@@ -3080,7 +3171,7 @@ void synchro_2(void)
       {
 	Cave[y-1][x] = Ydiamond_eat;
 	Next[y-1][x] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -3088,7 +3179,7 @@ void synchro_2(void)
       {
 	Cave[y][x+1] = Ydiamond_eat;
 	Next[y][x+1] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -3096,7 +3187,7 @@ void synchro_2(void)
       {
 	Cave[y+1][x] = Ydiamond_eat;
 	Next[y+1][x] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -3104,7 +3195,7 @@ void synchro_2(void)
       {
 	Cave[y][x-1] = Ydiamond_eat;
 	Next[y][x-1] = Xblank;
-	play[SAMPLE_eater] = 1;
+	play_element_sound(x, y, SAMPLE_eater_eat, element);
 	goto loop;
       }
 
@@ -3124,7 +3215,7 @@ void synchro_2(void)
   	  if (Cave[y-1][x-2] == Xblank)
 	    Cave[y-1][x-2] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -3141,13 +3232,28 @@ void synchro_2(void)
 
   	default:
   	  Next[y][x] = RANDOM & 1 ? Xeater_n : Xeater_s;
-  	  PLAY(SAMPLE_eater);
+  	  play_element_sound(x, y, SAMPLE_eater, element);
   	  goto loop;
       }
 
     /* --------------------------------------------------------------------- */
 
     case Xalien:
+
+#if 1
+
+      if (lev.wheel_cnt)
+      {
+	dx = lev.wheel_x;
+	dy = lev.wheel_y;
+      }
+      else
+      {
+	set_nearest_player_xy(x, y, &dx, &dy);
+      }
+
+#else
+
       if (lev.wheel_cnt)
       {
 	dx = lev.wheel_x;
@@ -3185,6 +3291,8 @@ void synchro_2(void)
 	dy = 0;
       }
 
+#endif
+
       if (RANDOM & 1)
       {
 	if (y > dy)
@@ -3205,7 +3313,7 @@ void synchro_2(void)
   	      if (Cave[y-2][x-1] == Xblank)
 		Cave[y-2][x-1] = Yacid_splash_wB;
   	      Next[y][x] = Xblank;
-  	      PLAY(SAMPLE_acid);
+  	      play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	      goto loop;
 
   	    case Xblank:
@@ -3218,7 +3326,7 @@ void synchro_2(void)
   	      Cave[y-1][x] = Yalien_n;
   	      Next[y][x] = Xblank;
   	      Next[y-1][x] = Xalien_pause;
-  	      PLAY(SAMPLE_alien);
+  	      play_element_sound(x, y, SAMPLE_alien, Xalien);
   	      goto loop;
 	  }
 	}
@@ -3240,7 +3348,7 @@ void synchro_2(void)
 		Cave[y][x+1] = Yacid_splash_eB;
   	      if (Cave[y][x-1] == Xblank)
 		Cave[y][x-1] = Yacid_splash_wB;
-  	      PLAY(SAMPLE_acid);
+  	      play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	      goto loop;
 
   	    case Xblank:
@@ -3253,7 +3361,7 @@ void synchro_2(void)
   	      Cave[y+1][x] = Yalien_s;
   	      Next[y][x] = Xblank;
   	      Next[y+1][x] = Xalien_pause;
-  	      PLAY(SAMPLE_alien);
+  	      play_element_sound(x, y, SAMPLE_alien, Xalien);
   	      goto loop;
 	  }
 	}
@@ -3278,7 +3386,7 @@ void synchro_2(void)
   	      if (Cave[y-1][x] == Xblank)
 		Cave[y-1][x] = Yacid_splash_wB;
   	      Next[y][x] = Xblank;
-  	      PLAY(SAMPLE_acid);
+  	      play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	      goto loop;
 
   	    case Xblank:
@@ -3291,7 +3399,7 @@ void synchro_2(void)
   	      Cave[y][x+1] = Yalien_e;
   	      Next[y][x] = Xblank;
   	      Next[y][x+1] = Xalien_pause;
-  	      PLAY(SAMPLE_alien);
+  	      play_element_sound(x, y, SAMPLE_alien, Xalien);
   	      goto loop;
 	  }
 	}
@@ -3313,7 +3421,7 @@ void synchro_2(void)
   	      if (Cave[y-1][x-2] == Xblank)
 		Cave[y-1][x-2] = Yacid_splash_wB;
   	      Next[y][x] = Xblank;
-  	      PLAY(SAMPLE_acid);
+  	      play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	      goto loop;
 
   	    case Xblank:
@@ -3326,7 +3434,7 @@ void synchro_2(void)
   	      Cave[y][x-1] = Yalien_w;
   	      Next[y][x] = Xblank;
   	      Next[y][x-1] = Xalien_pause;
-  	      PLAY(SAMPLE_alien);
+  	      play_element_sound(x, y, SAMPLE_alien, Xalien);
   	      goto loop;
 	  }
 	}
@@ -3357,7 +3465,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -3492,7 +3600,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -3529,7 +3637,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -3554,14 +3662,14 @@ void synchro_2(void)
   	    }
 
   	    Next[y][x] = Xblank;
-  	    play[SAMPLE_squash] = 1;
+  	    play_element_sound(x, y, SAMPLE_wonderfall, Xwonderwall);
   	    goto loop;
   	  }
 
   	default:
   	  Cave[y][x] = Xemerald;
   	  Next[y][x] = Xemerald;
-  	  PLAY(SAMPLE_diamond);
+  	  play_element_sound(x, y, SAMPLE_diamond, Xemerald);
   	  goto loop;
       }
 
@@ -3584,7 +3692,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -3719,7 +3827,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -3756,7 +3864,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -3781,14 +3889,14 @@ void synchro_2(void)
   	    }
 
   	    Next[y][x] = Xblank;
-  	    play[SAMPLE_squash] = 1;
+  	    play_element_sound(x, y, SAMPLE_wonderfall, Xwonderwall);
   	    goto loop;
   	  }
 
   	default:
   	  Cave[y][x] = Xdiamond;
   	  Next[y][x] = Xdiamond;
-  	  PLAY(SAMPLE_diamond);
+  	  play_element_sound(x, y, SAMPLE_diamond, Xdiamond);
   	  goto loop;
       }
 
@@ -3811,7 +3919,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xdrip_stretchB;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -3830,41 +3938,41 @@ void synchro_2(void)
   	  switch (RANDOM & 7)
 	  {
   	    case 0:
-	      temp = Xameuba_1;
+	      temp = Xamoeba_1;
 	      break;
 
   	    case 1:
-	      temp = Xameuba_2;
+	      temp = Xamoeba_2;
 	      break;
 
   	    case 2:
-	      temp = Xameuba_3;
+	      temp = Xamoeba_3;
 	      break;
 
   	    case 3:
-	      temp = Xameuba_4;
+	      temp = Xamoeba_4;
 	      break;
 
   	    case 4:
-	      temp = Xameuba_5;
+	      temp = Xamoeba_5;
 	      break;
 
   	    case 5:
-	      temp = Xameuba_6;
+	      temp = Xamoeba_6;
 	      break;
 
   	    case 6:
-	      temp = Xameuba_7;
+	      temp = Xamoeba_7;
 	      break;
 
   	    case 7:
-	      temp = Xameuba_8;
+	      temp = Xamoeba_8;
 	      break;
   	  }
 
   	  Cave[y][x] = temp;
   	  Next[y][x] = temp;
-  	  play[SAMPLE_drip] = 1;
+  	  play_element_sound(x, y, SAMPLE_drip, Xdrip_fall);
   	  goto loop;
       }
 
@@ -3903,7 +4011,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -4023,7 +4131,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -4060,7 +4168,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xblank;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -4084,6 +4192,9 @@ void synchro_2(void)
   	  Boom[y+1][x-1] = Xblank;
   	  Boom[y+1][x] = Xblank;
   	  Boom[y+1][x+1] = Xblank;
+#if 0
+	  play_element_sound(x, y, SAMPLE_boom, element);
+#endif
   	  goto loop;
       }
 
@@ -4112,7 +4223,7 @@ void synchro_2(void)
   	      if (Cave[y-2][x-1] == Xblank)
 		Cave[y-2][x-1] = Yacid_splash_wB;
   	      Next[y][x] = Xblank;
-  	      PLAY(SAMPLE_acid);
+  	      play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	      goto loop;
 
   	    case Xblank:
@@ -4145,7 +4256,7 @@ void synchro_2(void)
   	      if (Cave[y-1][x] == Xblank)
 		Cave[y-1][x] = Yacid_splash_wB;
   	      Next[y][x] = Xblank;
-  	      PLAY(SAMPLE_acid);
+  	      play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	      goto loop;
 
   	    case Xblank:
@@ -4178,7 +4289,7 @@ void synchro_2(void)
   	      if (Cave[y][x-1] == Xblank)
 		Cave[y][x-1] = Yacid_splash_wB;
   	      Next[y][x] = Xblank;
-  	      PLAY(SAMPLE_acid);
+  	      play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	      goto loop;
 
   	    case Xblank:
@@ -4211,7 +4322,7 @@ void synchro_2(void)
   	      if (Cave[y-1][x-2] == Xblank)
 		Cave[y-1][x-2] = Yacid_splash_wB;
   	      Next[y][x] = Xblank;
-  	      PLAY(SAMPLE_acid);
+  	      play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	      goto loop;
 
   	    case Xblank:
@@ -4262,6 +4373,38 @@ void synchro_2(void)
       Next[y][x] = Xacid_1;
       goto loop;
 
+    case Xfake_acid_1:
+      Next[y][x] = Xfake_acid_2;
+      goto loop;
+
+    case Xfake_acid_2:
+      Next[y][x] = Xfake_acid_3;
+      goto loop;
+
+    case Xfake_acid_3:
+      Next[y][x] = Xfake_acid_4;
+      goto loop;
+
+    case Xfake_acid_4:
+      Next[y][x] = Xfake_acid_5;
+      goto loop;
+
+    case Xfake_acid_5:
+      Next[y][x] = Xfake_acid_6;
+      goto loop;
+
+    case Xfake_acid_6:
+      Next[y][x] = Xfake_acid_7;
+      goto loop;
+
+    case Xfake_acid_7:
+      Next[y][x] = Xfake_acid_8;
+      goto loop;
+
+    case Xfake_acid_8:
+      Next[y][x] = Xfake_acid_1;
+      goto loop;
+
     /* --------------------------------------------------------------------- */
 
     case Xball_1:
@@ -4288,7 +4431,7 @@ void synchro_2(void)
 
     ball_common:
 
-      play[SAMPLE_ball] = 1;
+      play_element_sound(x, y, SAMPLE_ball, element);
       if (lev.ball_random)
       {
 	switch (RANDOM & 7)
@@ -4425,7 +4568,11 @@ void synchro_2(void)
 	}
       }
 
+#if 1
+      lev.ball_pos = (lev.ball_pos + 1) % lev.num_ball_arrays;
+#else
       lev.ball_pos = (lev.ball_pos + 1) & 7;
+#endif
       goto loop;
 
     /* --------------------------------------------------------------------- */
@@ -4435,14 +4582,14 @@ void synchro_2(void)
       {
 	Cave[y-1][x] = Ygrow_ns_eat;
 	Next[y-1][x] = Xgrow_ns;
-	play[SAMPLE_grow] = 1;
+	play_element_sound(x, y, SAMPLE_grow, Xgrow_ns);
       }
 
       if (tab_blank[Cave[y+1][x]])
       {
 	Cave[y+1][x] = Ygrow_ns_eat;
 	Next[y+1][x] = Xgrow_ns;
-	play[SAMPLE_grow] = 1;
+	play_element_sound(x, y, SAMPLE_grow, Xgrow_ns);
       }
 
       goto loop;
@@ -4452,14 +4599,14 @@ void synchro_2(void)
       {
 	Cave[y][x+1] = Ygrow_ew_eat;
 	Next[y][x+1] = Xgrow_ew;
-	play[SAMPLE_grow] = 1;
+	play_element_sound(x, y, SAMPLE_grow, Xgrow_ew);
       }
 
       if (tab_blank[Cave[y][x-1]])
       {
 	Cave[y][x-1] = Ygrow_ew_eat;
 	Next[y][x-1] = Xgrow_ew;
-	play[SAMPLE_grow] = 1;
+	play_element_sound(x, y, SAMPLE_grow, Xgrow_ew);
       }
 
       goto loop;
@@ -4470,7 +4617,7 @@ void synchro_2(void)
       if (lev.wonderwall_time && lev.wonderwall_state)
       {
 	Cave[y][x] = XwonderwallB;
-	play[SAMPLE_wonder] = 1;
+	play_element_sound(x, y, SAMPLE_wonder, Xwonderwall);
       }
 
       goto loop;
@@ -4498,6 +4645,8 @@ void synchro_2(void)
 	Next[y][x] = Xexit_1;
       }
 
+      play_element_sound(x, y, SAMPLE_exit_open, Xexit);
+
       goto loop;
 
     case Xexit_1:
@@ -4515,22 +4664,22 @@ void synchro_2(void)
     /* --------------------------------------------------------------------- */
 
     case Xdynamite_1:
-      play[SAMPLE_tick] = 1;
+      play_element_sound(x, y, SAMPLE_tick, Xdynamite_1);
       Next[y][x] = Xdynamite_2;
       goto loop;
 
     case Xdynamite_2:
-      play[SAMPLE_tick] = 1;
+      play_element_sound(x, y, SAMPLE_tick, Xdynamite_2);
       Next[y][x] = Xdynamite_3;
       goto loop;
 
     case Xdynamite_3:
-      play[SAMPLE_tick] = 1;
+      play_element_sound(x, y, SAMPLE_tick, Xdynamite_3);
       Next[y][x] = Xdynamite_4;
       goto loop;
 
     case Xdynamite_4:
-      play[SAMPLE_tick] = 1;
+      play_element_sound(x, y, SAMPLE_tick, Xdynamite_4);
       Next[y][x] = Zdynamite;
       Boom[y-1][x-1] = Xblank;
       Boom[y-1][x] = Xblank;
@@ -4576,7 +4725,7 @@ void synchro_2(void)
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
   	  Next[y][x] = Xsand_stonesand_4;
-  	  PLAY(SAMPLE_acid);
+  	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
@@ -4732,6 +4881,9 @@ void synchro_2(void)
       Boom[y+1][x-1] = Xemerald;
       Boom[y+1][x] = Xemerald;
       Boom[y+1][x+1] = Xemerald;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, element);
+#endif
       goto loop;
 
     case Xboom_bomb:
@@ -4748,12 +4900,20 @@ void synchro_2(void)
       Boom[y+1][x-1] = Xblank;
       Boom[y+1][x] = Xblank;
       Boom[y+1][x+1] = Xblank;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, element);
+#endif
       goto loop;
 
     case Xboom_android:
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, Xandroid);
+#endif
     case Xboom_1:
       Next[y][x] = Xboom_2;
-      play[SAMPLE_boom] = 1;
+#if 1
+      play_sound(x, y, SAMPLE_boom);
+#endif
       goto loop;
 
     case Xboom_2:
@@ -4779,10 +4939,10 @@ void synchro_2(void)
 
  done:
 
-  if (ply1.alive || ply2.alive)
-    lev.score += score; /* only get a score if someone is alive */
+  if (ply[0].alive || ply[1].alive || ply[2].alive || ply[3].alive)
+    lev.score += score;		/* only add a score if someone is alive */
 
-  Random = random;
+  RandomEM = random;
 
   {
     void *temp = Cave;