rnd-20040927-3-src

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

diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c
index 685672357a55abce8deed33db81d8739e7f717c5..d8f7913ce534e5efba868acf402f11338ea0ba8e 100644 (file)
--- a/src/game_em/synchro_2.c
+++ b/src/game_em/synchro_2.c
@@ -15,10 +15,6 @@
 
 
 #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;
 
 void synchro_2(void)
 {
@@ -29,14 +25,15 @@ void synchro_2(void)
   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 +348,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -482,7 +479,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -519,7 +516,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -537,7 +534,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_sound(x, y, SAMPLE_crack);
          score += lev.nut_score;
          goto loop;
 
@@ -713,7 +710,7 @@ void synchro_2(void)
            case Xplant:
            case Yplant:
              Next[y][x] = Xstone;
-             PLAY(SAMPLE_stone);
+             play_sound(x, y, SAMPLE_stone);
              goto loop;
          }
 
@@ -721,7 +718,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_sound(x, y, SAMPLE_squash);
          goto loop;
 
        case Xbomb:
@@ -752,14 +749,14 @@ void synchro_2(void)
            }
 
            Next[y][x] = Xblank;
-           play[SAMPLE_squash] = 1;
+           play_element_sound(x, y, SAMPLE_wonderfall, Xstone);
            goto loop;
          }
 
        default:
          Cave[y][x] = Xstone;
          Next[y][x] = Xstone;
-         PLAY(SAMPLE_stone);
+         play_sound(x, y, SAMPLE_stone);
          goto loop;
       }
 
@@ -782,7 +779,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -903,7 +900,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -940,7 +937,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -956,17 +953,17 @@ void synchro_2(void)
        default:
          Cave[y][x] = Xnut;
          Next[y][x] = Xnut;
-         PLAY(SAMPLE_nut);
+         play_sound(x, y, SAMPLE_nut);
          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 +984,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ybug_n_e;
          Next[y][x] = Xbug_goe;
-         PLAY(SAMPLE_bug);
+         play_sound(x, y, SAMPLE_bug);
          goto loop;
 
        default:
@@ -995,10 +992,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 +1016,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -1032,23 +1029,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_sound(x, y, SAMPLE_bug);
          goto loop;
 
        default:
          Cave[y][x] = Ybug_n_w;
          Next[y][x] = Xbug_gow;
-         PLAY(SAMPLE_bug);
+         play_sound(x, y, SAMPLE_bug);
          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 +1066,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ybug_e_s;
          Next[y][x] = Xbug_gos;
-         PLAY(SAMPLE_bug);
+         play_sound(x, y, SAMPLE_bug);
          goto loop;
 
        default:
@@ -1077,10 +1074,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 +1098,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -1114,23 +1111,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_sound(x, y, SAMPLE_bug);
          goto loop;
 
        default:
          Cave[y][x] = Ybug_e_n;
          Next[y][x] = Xbug_gon;
-         PLAY(SAMPLE_bug);
+         play_sound(x, y, SAMPLE_bug);
          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 +1148,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ybug_s_w;
          Next[y][x] = Xbug_gow;
-         PLAY(SAMPLE_bug);
+         play_sound(x, y, SAMPLE_bug);
          goto loop;
 
        default:
@@ -1159,10 +1156,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 +1180,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -1196,23 +1193,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_sound(x, y, SAMPLE_bug);
          goto loop;
 
        default:
          Cave[y][x] = Ybug_s_e;
          Next[y][x] = Xbug_goe;
-         PLAY(SAMPLE_bug);
+         play_sound(x, y, SAMPLE_bug);
          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 +1230,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ybug_w_n;
          Next[y][x] = Xbug_gon;
-         PLAY(SAMPLE_bug);
+         play_sound(x, y, SAMPLE_bug);
          goto loop;
 
        default:
@@ -1241,10 +1238,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 +1262,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -1278,23 +1275,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_sound(x, y, SAMPLE_bug);
          goto loop;
 
        default:
          Cave[y][x] = Ybug_w_s;
          Next[y][x] = Xbug_gos;
-         PLAY(SAMPLE_bug);
+         play_sound(x, y, SAMPLE_bug);
          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 +1312,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ytank_n_w;
          Next[y][x] = Xtank_gow;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -1323,10 +1320,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 +1344,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -1360,23 +1357,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_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
          Cave[y][x] = Ytank_n_e;
          Next[y][x] = Xtank_goe;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          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 +1394,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ytank_e_n;
          Next[y][x] = Xtank_gon;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -1405,10 +1402,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 +1426,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -1442,23 +1439,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_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
          Cave[y][x] = Ytank_e_s;
          Next[y][x] = Xtank_gos;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          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 +1476,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ytank_s_e;
          Next[y][x] = Xtank_goe;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -1487,10 +1484,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 +1508,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -1524,23 +1521,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_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
          Cave[y][x] = Ytank_s_w;
          Next[y][x] = Xtank_gow;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          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 +1558,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ytank_w_s;
          Next[y][x] = Xtank_gos;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -1569,10 +1566,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 +1590,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -1606,13 +1603,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_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
          Cave[y][x] = Ytank_w_n;
          Next[y][x] = Xtank_gon;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          goto loop;
       }
 
@@ -1728,7 +1725,7 @@ void synchro_2(void)
        }
 
        Next[y][x] = temp; /* the item we chose to clone */
-       play[SAMPLE_android] = 1;
+       play_sound(x, y, SAMPLE_android);
 
        switch (RANDOM & 7)
        {
@@ -2000,7 +1997,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_sound(x, y, SAMPLE_tank);
       goto loop;
 
     android_ne:
@@ -2008,7 +2005,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_sound(x, y, SAMPLE_tank);
       goto loop;
 
     android_e:
@@ -2016,7 +2013,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_sound(x, y, SAMPLE_tank);
       goto loop;
 
     android_se:
@@ -2024,7 +2021,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_sound(x, y, SAMPLE_tank);
       goto loop;
 
     android_s:
@@ -2032,7 +2029,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_sound(x, y, SAMPLE_tank);
       goto loop;
 
     android_sw:
@@ -2040,7 +2037,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_sound(x, y, SAMPLE_tank);
       goto loop;
 
     android_w:
@@ -2048,7 +2045,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_sound(x, y, SAMPLE_tank);
       goto loop;
 
     android_nw:
@@ -2056,7 +2053,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_sound(x, y, SAMPLE_tank);
       goto loop;
 
     /* --------------------------------------------------------------------- */
@@ -2078,7 +2075,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2088,7 +2085,7 @@ void synchro_2(void)
          Cave[y-1][x] = Yandroid_n;
          Next[y][x] = Xblank;
          Next[y-1][x] = Xandroid;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -2112,7 +2109,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2122,7 +2119,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_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -2148,7 +2145,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2158,7 +2155,7 @@ void synchro_2(void)
          Cave[y][x+1] = Yandroid_e;
          Next[y][x] = Xblank;
          Next[y][x+1] = Xandroid;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -2182,7 +2179,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2192,7 +2189,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_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -2218,7 +2215,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2228,7 +2225,7 @@ void synchro_2(void)
          Cave[y+1][x] = Yandroid_s;
          Next[y][x] = Xblank;
          Next[y+1][x] = Xandroid;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -2252,7 +2249,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2262,7 +2259,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_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -2288,7 +2285,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2298,7 +2295,7 @@ void synchro_2(void)
          Cave[y][x-1] = Yandroid_w;
          Next[y][x] = Xblank;
          Next[y][x-1] = Xandroid;
-         PLAY(SAMPLE_tank);
+         play_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -2322,7 +2319,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2332,7 +2329,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_sound(x, y, SAMPLE_tank);
          goto loop;
 
        default:
@@ -2358,7 +2355,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2512,7 +2509,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2549,7 +2546,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2581,7 +2578,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2607,7 +2604,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_sound(x, y, SAMPLE_slurp);
          score += lev.slurp_score;
          goto loop;
 
@@ -2615,13 +2612,13 @@ void synchro_2(void)
        case XbumperB:
          Cave[y][x+1] = XbumperB;
          Next[y][x] = Xspring_w;
-         PLAY(SAMPLE_spring);
+         play_sound(x, y, SAMPLE_spring);
          goto loop;
 
        default:
          Cave[y][x] = Xspring;
          Next[y][x] = Xspring;
-         PLAY(SAMPLE_spring);
+         play_sound(x, y, SAMPLE_spring);
          goto loop;
       }
 
@@ -2644,7 +2641,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2676,7 +2673,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2702,7 +2699,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_sound(x, y, SAMPLE_slurp);
          score += lev.slurp_score;
          goto loop;
 
@@ -2710,13 +2707,13 @@ void synchro_2(void)
        case XbumperB:
          Cave[y][x-1] = XbumperB;
          Next[y][x] = Xspring_e;
-         PLAY(SAMPLE_spring);
+         play_sound(x, y, SAMPLE_spring);
          goto loop;
 
        default:
          Cave[y][x] = Xspring;
          Next[y][x] = Xspring;
-         PLAY(SAMPLE_spring);
+         play_sound(x, y, SAMPLE_spring);
          goto loop;
       }
 
@@ -2739,7 +2736,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2853,7 +2850,7 @@ void synchro_2(void)
        default:
          Cave[y][x] = Xspring;
          Next[y][x] = Xspring;
-         PLAY(SAMPLE_spring);
+         play_sound(x, y, SAMPLE_spring);
          goto loop;
       }
 
@@ -2864,7 +2861,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, Xdiamond);
        goto loop;
       }
 
@@ -2872,7 +2869,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, Xdiamond);
        goto loop;
       }
 
@@ -2880,7 +2877,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, Xdiamond);
        goto loop;
       }
 
@@ -2888,7 +2885,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, Xdiamond);
        goto loop;
       }
 
@@ -2908,7 +2905,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2925,7 +2922,7 @@ void synchro_2(void)
 
        default:
          Next[y][x] = RANDOM & 1 ? Xeater_e : Xeater_w;
-         PLAY(SAMPLE_eater);
+         play_sound(x, y, SAMPLE_eater);
          goto loop;
       }
 
@@ -2936,7 +2933,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, Xdiamond);
        goto loop;
       }
 
@@ -2944,7 +2941,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, Xdiamond);
        goto loop;
       }
 
@@ -2952,7 +2949,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, Xdiamond);
        goto loop;
       }
 
@@ -2960,7 +2957,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, Xdiamond);
        goto loop;
       }
 
@@ -2980,7 +2977,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -2997,7 +2994,7 @@ void synchro_2(void)
 
        default:
          Next[y][x] = RANDOM & 1 ? Xeater_n : Xeater_s;
-         PLAY(SAMPLE_eater);
+         play_sound(x, y, SAMPLE_eater);
          goto loop;
       }
 
@@ -3008,7 +3005,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, Xdiamond);
        goto loop;
       }
 
@@ -3016,7 +3013,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, Xdiamond);
        goto loop;
       }
 
@@ -3024,7 +3021,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, Xdiamond);
        goto loop;
       }
 
@@ -3032,7 +3029,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, Xdiamond);
        goto loop;
       }
 
@@ -3052,7 +3049,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -3069,7 +3066,7 @@ void synchro_2(void)
 
        default:
          Next[y][x] = RANDOM & 1 ? Xeater_e : Xeater_w;
-         PLAY(SAMPLE_eater);
+         play_sound(x, y, SAMPLE_eater);
          goto loop;
       }
 
@@ -3080,7 +3077,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, Xdiamond);
        goto loop;
       }
 
@@ -3088,7 +3085,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, Xdiamond);
        goto loop;
       }
 
@@ -3096,7 +3093,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, Xdiamond);
        goto loop;
       }
 
@@ -3104,7 +3101,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, Xdiamond);
        goto loop;
       }
 
@@ -3124,7 +3121,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -3141,7 +3138,7 @@ void synchro_2(void)
 
        default:
          Next[y][x] = RANDOM & 1 ? Xeater_n : Xeater_s;
-         PLAY(SAMPLE_eater);
+         play_sound(x, y, SAMPLE_eater);
          goto loop;
       }
 
@@ -3205,7 +3202,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_sound(x, y, SAMPLE_acid);
              goto loop;
 
            case Xblank:
@@ -3218,7 +3215,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_sound(x, y, SAMPLE_alien);
              goto loop;
          }
        }
@@ -3240,7 +3237,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_sound(x, y, SAMPLE_acid);
              goto loop;
 
            case Xblank:
@@ -3253,7 +3250,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_sound(x, y, SAMPLE_alien);
              goto loop;
          }
        }
@@ -3278,7 +3275,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_sound(x, y, SAMPLE_acid);
              goto loop;
 
            case Xblank:
@@ -3291,7 +3288,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_sound(x, y, SAMPLE_alien);
              goto loop;
          }
        }
@@ -3313,7 +3310,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_sound(x, y, SAMPLE_acid);
              goto loop;
 
            case Xblank:
@@ -3326,7 +3323,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_sound(x, y, SAMPLE_alien);
              goto loop;
          }
        }
@@ -3357,7 +3354,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -3492,7 +3489,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -3529,7 +3526,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -3554,14 +3551,14 @@ void synchro_2(void)
            }
 
            Next[y][x] = Xblank;
-           play[SAMPLE_squash] = 1;
+           play_element_sound(x, y, SAMPLE_wonderfall, Xemerald);
            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 +3581,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -3719,7 +3716,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -3756,7 +3753,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -3781,14 +3778,14 @@ void synchro_2(void)
            }
 
            Next[y][x] = Xblank;
-           play[SAMPLE_squash] = 1;
+           play_element_sound(x, y, SAMPLE_wonderfall, Xdiamond);
            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 +3808,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -3830,41 +3827,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_sound(x, y, SAMPLE_drip);
          goto loop;
       }
 
@@ -3903,7 +3900,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -4023,7 +4020,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -4060,7 +4057,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -4112,7 +4109,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_sound(x, y, SAMPLE_acid);
              goto loop;
 
            case Xblank:
@@ -4145,7 +4142,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_sound(x, y, SAMPLE_acid);
              goto loop;
 
            case Xblank:
@@ -4178,7 +4175,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_sound(x, y, SAMPLE_acid);
              goto loop;
 
            case Xblank:
@@ -4211,7 +4208,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_sound(x, y, SAMPLE_acid);
              goto loop;
 
            case Xblank:
@@ -4288,7 +4285,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)
@@ -4435,14 +4432,14 @@ void synchro_2(void)
       {
        Cave[y-1][x] = Ygrow_ns_eat;
        Next[y-1][x] = Xgrow_ns;
-       play[SAMPLE_grow] = 1;
+       play_sound(x, y, SAMPLE_grow);
       }
 
       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_sound(x, y, SAMPLE_grow);
       }
 
       goto loop;
@@ -4452,14 +4449,14 @@ void synchro_2(void)
       {
        Cave[y][x+1] = Ygrow_ew_eat;
        Next[y][x+1] = Xgrow_ew;
-       play[SAMPLE_grow] = 1;
+       play_sound(x, y, SAMPLE_grow);
       }
 
       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_sound(x, y, SAMPLE_grow);
       }
 
       goto loop;
@@ -4470,7 +4467,7 @@ void synchro_2(void)
       if (lev.wonderwall_time && lev.wonderwall_state)
       {
        Cave[y][x] = XwonderwallB;
-       play[SAMPLE_wonder] = 1;
+       play_sound(x, y, SAMPLE_wonder);
       }
 
       goto loop;
@@ -4515,22 +4512,22 @@ void synchro_2(void)
     /* --------------------------------------------------------------------- */
 
     case Xdynamite_1:
-      play[SAMPLE_tick] = 1;
+      play_sound(x, y, SAMPLE_tick);
       Next[y][x] = Xdynamite_2;
       goto loop;
 
     case Xdynamite_2:
-      play[SAMPLE_tick] = 1;
+      play_sound(x, y, SAMPLE_tick);
       Next[y][x] = Xdynamite_3;
       goto loop;
 
     case Xdynamite_3:
-      play[SAMPLE_tick] = 1;
+      play_sound(x, y, SAMPLE_tick);
       Next[y][x] = Xdynamite_4;
       goto loop;
 
     case Xdynamite_4:
-      play[SAMPLE_tick] = 1;
+      play_sound(x, y, SAMPLE_tick);
       Next[y][x] = Zdynamite;
       Boom[y-1][x-1] = Xblank;
       Boom[y-1][x] = Xblank;
@@ -4576,7 +4573,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_sound(x, y, SAMPLE_acid);
          goto loop;
 
        case Xblank:
@@ -4753,7 +4750,7 @@ void synchro_2(void)
     case Xboom_android:
     case Xboom_1:
       Next[y][x] = Xboom_2;
-      play[SAMPLE_boom] = 1;
+      play_sound(x, y, SAMPLE_boom);
       goto loop;
 
     case Xboom_2: