X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_2.c;h=c8a50916fac0e25fa3848bab0a02397d4478d503;hb=9583e9c55b889974e0df9a8ca1930efdf29bda29;hp=4fbf2d9f182a56ac443bb2bc9310455fd3a0c416;hpb=08cbfb7b24ed1170a91e5e9d6d683d6162f120f9;p=rocksndiamonds.git diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c index 4fbf2d9f..c8a50916 100644 --- a/src/game_em/synchro_2.c +++ b/src/game_em/synchro_2.c @@ -14,13 +14,7 @@ #include "sample.h" -#if defined(TARGET_X11) - #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) { @@ -31,8 +25,6 @@ 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; @@ -353,7 +345,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: @@ -484,7 +476,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: @@ -521,7 +513,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: @@ -539,7 +531,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; @@ -715,7 +707,7 @@ void synchro_2(void) case Xplant: case Yplant: Next[y][x] = Xstone; - PLAY(SAMPLE_stone); + play_sound(x, y, SAMPLE_stone); goto loop; } @@ -723,7 +715,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: @@ -754,14 +746,14 @@ void synchro_2(void) } Next[y][x] = Xblank; - play[SAMPLE_squash] = 1; + play_sound(x, y, SAMPLE_squash); goto loop; } default: Cave[y][x] = Xstone; Next[y][x] = Xstone; - PLAY(SAMPLE_stone); + play_sound(x, y, SAMPLE_stone); goto loop; } @@ -784,7 +776,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: @@ -905,7 +897,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: @@ -942,7 +934,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: @@ -958,17 +950,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]) @@ -989,7 +981,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: @@ -997,10 +989,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: @@ -1021,7 +1013,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: @@ -1034,23 +1026,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]) @@ -1071,7 +1063,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: @@ -1079,10 +1071,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: @@ -1103,7 +1095,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: @@ -1116,23 +1108,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]) @@ -1153,7 +1145,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: @@ -1161,10 +1153,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: @@ -1185,7 +1177,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: @@ -1198,23 +1190,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]) @@ -1235,7 +1227,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: @@ -1243,10 +1235,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: @@ -1267,7 +1259,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: @@ -1280,23 +1272,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]) @@ -1317,7 +1309,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: @@ -1325,10 +1317,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: @@ -1349,7 +1341,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: @@ -1362,23 +1354,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]) @@ -1399,7 +1391,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: @@ -1407,10 +1399,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: @@ -1431,7 +1423,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: @@ -1444,23 +1436,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]) @@ -1481,7 +1473,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: @@ -1489,10 +1481,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: @@ -1513,7 +1505,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: @@ -1526,23 +1518,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]) @@ -1563,7 +1555,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: @@ -1571,10 +1563,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: @@ -1595,7 +1587,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: @@ -1608,13 +1600,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; } @@ -1730,7 +1722,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) { @@ -2002,7 +1994,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: @@ -2010,7 +2002,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: @@ -2018,7 +2010,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: @@ -2026,7 +2018,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: @@ -2034,7 +2026,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: @@ -2042,7 +2034,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: @@ -2050,7 +2042,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: @@ -2058,7 +2050,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; /* --------------------------------------------------------------------- */ @@ -2080,7 +2072,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: @@ -2090,7 +2082,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: @@ -2114,7 +2106,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: @@ -2124,7 +2116,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: @@ -2150,7 +2142,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: @@ -2160,7 +2152,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: @@ -2184,7 +2176,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: @@ -2194,7 +2186,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: @@ -2220,7 +2212,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: @@ -2230,7 +2222,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: @@ -2254,7 +2246,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: @@ -2264,7 +2256,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: @@ -2290,7 +2282,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: @@ -2300,7 +2292,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: @@ -2324,7 +2316,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: @@ -2334,7 +2326,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: @@ -2360,7 +2352,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: @@ -2514,7 +2506,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: @@ -2551,7 +2543,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: @@ -2583,7 +2575,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: @@ -2609,7 +2601,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; @@ -2617,13 +2609,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; } @@ -2646,7 +2638,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: @@ -2678,7 +2670,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: @@ -2704,7 +2696,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; @@ -2712,13 +2704,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; } @@ -2741,7 +2733,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: @@ -2855,7 +2847,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; } @@ -2866,7 +2858,7 @@ void synchro_2(void) { Cave[y][x+1] = Ydiamond_eat; Next[y][x+1] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -2874,7 +2866,7 @@ void synchro_2(void) { Cave[y+1][x] = Ydiamond_eat; Next[y+1][x] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -2882,7 +2874,7 @@ void synchro_2(void) { Cave[y][x-1] = Ydiamond_eat; Next[y][x-1] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -2890,7 +2882,7 @@ void synchro_2(void) { Cave[y-1][x] = Ydiamond_eat; Next[y-1][x] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -2910,7 +2902,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: @@ -2927,7 +2919,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; } @@ -2938,7 +2930,7 @@ void synchro_2(void) { Cave[y+1][x] = Ydiamond_eat; Next[y+1][x] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -2946,7 +2938,7 @@ void synchro_2(void) { Cave[y][x-1] = Ydiamond_eat; Next[y][x-1] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -2954,7 +2946,7 @@ void synchro_2(void) { Cave[y-1][x] = Ydiamond_eat; Next[y-1][x] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -2962,7 +2954,7 @@ void synchro_2(void) { Cave[y][x+1] = Ydiamond_eat; Next[y][x+1] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -2982,7 +2974,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: @@ -2999,7 +2991,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; } @@ -3010,7 +3002,7 @@ void synchro_2(void) { Cave[y][x-1] = Ydiamond_eat; Next[y][x-1] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -3018,7 +3010,7 @@ void synchro_2(void) { Cave[y-1][x] = Ydiamond_eat; Next[y-1][x] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -3026,7 +3018,7 @@ void synchro_2(void) { Cave[y][x+1] = Ydiamond_eat; Next[y][x+1] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -3034,7 +3026,7 @@ void synchro_2(void) { Cave[y+1][x] = Ydiamond_eat; Next[y+1][x] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -3054,7 +3046,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: @@ -3071,7 +3063,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; } @@ -3082,7 +3074,7 @@ void synchro_2(void) { Cave[y-1][x] = Ydiamond_eat; Next[y-1][x] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -3090,7 +3082,7 @@ void synchro_2(void) { Cave[y][x+1] = Ydiamond_eat; Next[y][x+1] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -3098,7 +3090,7 @@ void synchro_2(void) { Cave[y+1][x] = Ydiamond_eat; Next[y+1][x] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -3106,7 +3098,7 @@ void synchro_2(void) { Cave[y][x-1] = Ydiamond_eat; Next[y][x-1] = Xblank; - play[SAMPLE_eater] = 1; + play_sound(x, y, SAMPLE_eater); goto loop; } @@ -3126,7 +3118,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: @@ -3143,7 +3135,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; } @@ -3207,7 +3199,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: @@ -3220,7 +3212,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; } } @@ -3242,7 +3234,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: @@ -3255,7 +3247,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; } } @@ -3280,7 +3272,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: @@ -3293,7 +3285,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; } } @@ -3315,7 +3307,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: @@ -3328,7 +3320,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; } } @@ -3359,7 +3351,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: @@ -3494,7 +3486,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: @@ -3531,7 +3523,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: @@ -3556,14 +3548,14 @@ void synchro_2(void) } Next[y][x] = Xblank; - play[SAMPLE_squash] = 1; + play_sound(x, y, SAMPLE_squash); goto loop; } default: Cave[y][x] = Xemerald; Next[y][x] = Xemerald; - PLAY(SAMPLE_diamond); + play_sound(x, y, SAMPLE_diamond); goto loop; } @@ -3586,7 +3578,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: @@ -3721,7 +3713,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: @@ -3758,7 +3750,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: @@ -3783,14 +3775,14 @@ void synchro_2(void) } Next[y][x] = Xblank; - play[SAMPLE_squash] = 1; + play_sound(x, y, SAMPLE_squash); goto loop; } default: Cave[y][x] = Xdiamond; Next[y][x] = Xdiamond; - PLAY(SAMPLE_diamond); + play_sound(x, y, SAMPLE_diamond); goto loop; } @@ -3813,7 +3805,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: @@ -3832,41 +3824,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; } @@ -3905,7 +3897,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: @@ -4025,7 +4017,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: @@ -4062,7 +4054,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: @@ -4114,7 +4106,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: @@ -4147,7 +4139,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: @@ -4180,7 +4172,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: @@ -4213,7 +4205,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: @@ -4290,7 +4282,7 @@ void synchro_2(void) ball_common: - play[SAMPLE_ball] = 1; + play_sound(x, y, SAMPLE_ball); if (lev.ball_random) { switch (RANDOM & 7) @@ -4437,14 +4429,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; @@ -4454,14 +4446,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; @@ -4472,7 +4464,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; @@ -4517,22 +4509,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; @@ -4578,7 +4570,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: @@ -4755,7 +4747,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: @@ -4795,5 +4787,3 @@ void synchro_2(void) Draw = temp; } } - -#endif