X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=a8ff691a2d65828392b9d1d53dc77861bba46bd7;hb=f47cd4b09952aaf95d16542f6b53f2d8bf9e1d7d;hp=e83a38f7b8200b0846c0a64064f33663f2ed0107;hpb=9583e9c55b889974e0df9a8ca1930efdf29bda29;p=rocksndiamonds.git diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c index e83a38f7..a8ff691a 100644 --- a/src/game_em/synchro_1.c +++ b/src/game_em/synchro_1.c @@ -84,6 +84,9 @@ static int test(struct PLAYER *ply) register unsigned int x = ply->x; register unsigned int y = ply->y; + if (!ply->alive) + return 0; + if (lev.time == 0) return(1); @@ -205,6 +208,9 @@ static void die(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y-1][x] = Xboom_bug; +#if 0 + play_element_sound(x, y, SAMPLE_boom, Zplayer); +#endif break; case Xtank_n: @@ -216,6 +222,9 @@ static void die(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y-1][x] = Xboom_bomb; +#if 0 + play_element_sound(x, y, SAMPLE_boom, Zplayer); +#endif break; } @@ -230,6 +239,9 @@ static void die(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y][x+1] = Xboom_bug; +#if 0 + play_element_sound(x, y, SAMPLE_boom, Zplayer); +#endif break; case Xtank_n: @@ -241,6 +253,9 @@ static void die(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y][x+1] = Xboom_bomb; +#if 0 + play_element_sound(x, y, SAMPLE_boom, Zplayer); +#endif break; } @@ -255,6 +270,9 @@ static void die(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y+1][x] = Xboom_bug; +#if 0 + play_element_sound(x, y, SAMPLE_boom, Zplayer); +#endif break; case Xtank_n: @@ -266,6 +284,9 @@ static void die(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y+1][x] = Xboom_bomb; +#if 0 + play_element_sound(x, y, SAMPLE_boom, Zplayer); +#endif break; } @@ -280,6 +301,9 @@ static void die(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y][x-1] = Xboom_bug; +#if 0 + play_element_sound(x, y, SAMPLE_boom, Zplayer); +#endif break; case Xtank_n: @@ -291,6 +315,9 @@ static void die(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y][x-1] = Xboom_bomb; +#if 0 + play_element_sound(x, y, SAMPLE_boom, Zplayer); +#endif break; } @@ -299,11 +326,11 @@ static void die(struct PLAYER *ply) case Xexit_1: case Xexit_2: case Xexit_3: - play_sound(x, y, SAMPLE_exit); + play_element_sound(x, y, SAMPLE_exit, Xexit_1); break; default: - play_sound(x, y, SAMPLE_die); + play_element_sound(x, y, SAMPLE_die, Zplayer); break; } @@ -390,7 +417,7 @@ static void player(struct PLAYER *ply) if (++ply->dynamite_cnt == 5 && ply->dynamite) { Cave[y][x] = Xdynamite_1; - play_sound(x, y, SAMPLE_dynamite); + play_element_sound(x, y, SAMPLE_dynamite, Xdynamite_1); ply->dynamite--; } } @@ -410,6 +437,8 @@ static void player(struct PLAYER *ply) if (ply->joy_fire == 0) { + int element = Cave[y][x]; + switch(Cave[y][x]) { /* fire is released */ @@ -418,7 +447,7 @@ static void player(struct PLAYER *ply) case Yacid_splash_wB: Cave[y][x] = Zplayer; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_blank); + play_element_sound(x, y, SAMPLE_blank, Xblank); ply->anim = SPR_walk + anim; ply->x = x; ply->y = y; @@ -459,7 +488,7 @@ static void player(struct PLAYER *ply) Cave[y][x] = (dy ? (dy < 0 ? Ygrass_nB : Ygrass_sB) : (dx > 0 ? Ygrass_eB : Ygrass_wB)); Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_dirt); + play_element_sound(x, y, SAMPLE_dirt, Xgrass); ply->anim = SPR_walk + anim; ply->x = x; ply->y = y; @@ -469,7 +498,7 @@ static void player(struct PLAYER *ply) Cave[y][x] = (dy ? (dy < 0 ? Ydirt_nB : Ydirt_sB) : (dx > 0 ? Ydirt_eB : Ydirt_wB)); Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_dirt); + play_element_sound(x, y, SAMPLE_dirt, Xdirt); ply->anim = SPR_walk + anim; ply->x = x; ply->y = y; @@ -479,7 +508,7 @@ static void player(struct PLAYER *ply) case Xdiamond_pause: Cave[y][x] = Ydiamond_eat; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.diamond_score; lev.required = lev.required < 3 ? 0 : lev.required - 3; ply->anim = SPR_walk + anim; @@ -491,7 +520,7 @@ static void player(struct PLAYER *ply) case Xemerald_pause: Cave[y][x] = Yemerald_eat; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.emerald_score; lev.required = lev.required < 1 ? 0 : lev.required - 1; ply->anim = SPR_walk + anim; @@ -502,7 +531,7 @@ static void player(struct PLAYER *ply) case Xdynamite: Cave[y][x] = Ydynamite_eat; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.dynamite_score; ply->dynamite = ply->dynamite > 9998 ? 9999 : ply->dynamite + 1; ply->anim = SPR_walk + anim; @@ -546,7 +575,7 @@ static void player(struct PLAYER *ply) Cave[y][x] = Yball_eat; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.key_score; ply->anim = SPR_walk + anim; ply->x = x; @@ -556,7 +585,7 @@ static void player(struct PLAYER *ply) case Xlenses: Cave[y][x] = Yball_eat; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.lenses_score; lev.lenses_cnt = lev.lenses_time; ply->anim = SPR_walk + anim; @@ -567,7 +596,7 @@ static void player(struct PLAYER *ply) case Xmagnify: Cave[y][x] = Yball_eat; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.magnify_score; lev.magnify_cnt = lev.magnify_time; ply->anim = SPR_walk + anim; @@ -606,7 +635,7 @@ static void player(struct PLAYER *ply) Cave[y][x] = dx > 0 ? Ystone_eB : Ystone_wB; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_roll); + play_element_sound(x, y, SAMPLE_roll, Xstone); ply->x = x; } @@ -644,7 +673,7 @@ static void player(struct PLAYER *ply) Cave[y][x] = dx > 0 ? Ybomb_eB : Ybomb_wB; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_roll); + play_element_sound(x, y, SAMPLE_roll, Xbomb); ply->x = x; } @@ -682,7 +711,7 @@ static void player(struct PLAYER *ply) Cave[y][x] = dx > 0 ? Ynut_eB : Ynut_wB; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_roll); + play_element_sound(x, y, SAMPLE_roll, Xnut); ply->x = x; } @@ -701,7 +730,7 @@ static void player(struct PLAYER *ply) Cave[y][x+dx] = dx > 0 ? Yspring_kill_e : Yspring_kill_w; Next[y][x] = Zplayer; Next[y][x+dx] = dx > 0 ? Xspring_e : Xspring_w; - play_sound(x, y, SAMPLE_slurp); + play_element_sound(x, y, SAMPLE_slurp, Xalien); lev.score += lev.slurp_score; ply->x = x; break; @@ -730,7 +759,7 @@ static void player(struct PLAYER *ply) spring_walk: Cave[y][x] = dx > 0 ? Yspring_eB : Yspring_wB; Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_roll); + play_element_sound(x, y, SAMPLE_roll, Xspring); ply->x = x; } @@ -780,7 +809,7 @@ static void player(struct PLAYER *ply) Cave[y][x] = (dy ? (dy < 0 ? Yballoon_nB : Yballoon_sB) : (dx > 0 ? Yballoon_eB : Yballoon_wB)); Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_push); + play_element_sound(x, y, SAMPLE_push, Xballoon); ply->x = x; ply->y = y; } @@ -826,7 +855,7 @@ static void player(struct PLAYER *ply) Cave[y][x] = (dy ? (dy < 0 ? Yandroid_nB : Yandroid_sB) : (dx > 0 ? Yandroid_eB : Yandroid_wB)); Next[y][x] = Zplayer; - play_sound(x, y, SAMPLE_push); + play_element_sound(x, y, SAMPLE_push, Xandroid); ply->x = x; ply->y = y; } @@ -896,14 +925,14 @@ static void player(struct PLAYER *ply) Cave[y+dy][x+dx] = Zplayer; Next[y+dy][x+dx] = Zplayer; - play_sound(x, y, SAMPLE_door); + play_element_sound(x, y, SAMPLE_door, element); ply->anim = SPR_walk + anim; ply->x = x + dx; ply->y = y + dy; break; case Xwheel: - play_sound(x, y, SAMPLE_press); + play_element_sound(x, y, SAMPLE_press, element); lev.wheel_cnt = lev.wheel_time; lev.wheel_x = x; lev.wheel_y = y; @@ -930,17 +959,17 @@ static void player(struct PLAYER *ply) goto wind_walk; wind_walk: - play_sound(x, y, SAMPLE_press); + play_element_sound(x, y, SAMPLE_press, element); lev.wind_cnt = lev.wind_time; break; case Xwind_stop: - play_sound(x, y, SAMPLE_press); + play_element_sound(x, y, SAMPLE_press, element); lev.wind_cnt = 0; break; case Xswitch: - play_sound(x, y, SAMPLE_press); + play_element_sound(x, y, SAMPLE_press, element); lev.ball_cnt = lev.ball_time; lev.ball_state = !lev.ball_state; break; @@ -948,7 +977,7 @@ static void player(struct PLAYER *ply) case Xplant: Cave[y][x] = Yplant; Next[y][x] = Xplant; - play_sound(x, y, SAMPLE_blank); + play_element_sound(x, y, SAMPLE_blank, Xplant); ply->anim = SPR_walk + anim; ply->x = x; ply->y = y; @@ -957,7 +986,7 @@ static void player(struct PLAYER *ply) case Xexit_1: case Xexit_2: case Xexit_3: - play_sound(x, y, SAMPLE_exit); + play_element_sound(x, y, SAMPLE_exit, Xexit_1); if (--lev.home == 0) lev.score += lev.time * lev.exit_score / 100; ply->anim = SPR_walk + anim; @@ -968,6 +997,8 @@ static void player(struct PLAYER *ply) } else { + int element = Cave[y][x]; + switch(Cave[y][x]) { /* fire is pressed */ @@ -976,7 +1007,7 @@ static void player(struct PLAYER *ply) case Xdirt: Cave[y][x] = Yball_eat; Next[y][x] = Xblank; - play_sound(x, y, SAMPLE_dirt); + play_element_sound(x, y, SAMPLE_dirt, element); ply->anim = SPR_spray + anim; break; @@ -984,7 +1015,7 @@ static void player(struct PLAYER *ply) case Xdiamond_pause: Cave[y][x] = Ydiamond_eat; Next[y][x] = Xblank; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.diamond_score; lev.required = lev.required < 3 ? 0 : lev.required - 3; ply->anim = SPR_walk + anim; @@ -994,7 +1025,7 @@ static void player(struct PLAYER *ply) case Xemerald_pause: Cave[y][x] = Yemerald_eat; Next[y][x] = Xblank; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.emerald_score; lev.required = lev.required < 1 ? 0 : lev.required - 1; ply->anim = SPR_walk + anim; @@ -1003,7 +1034,7 @@ static void player(struct PLAYER *ply) case Xdynamite: Cave[y][x] = Ydynamite_eat; Next[y][x] = Xblank; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.dynamite_score; ply->dynamite = ply->dynamite > 9998 ? 9999 : ply->dynamite + 1; ply->anim = SPR_walk + anim; @@ -1044,7 +1075,7 @@ static void player(struct PLAYER *ply) key_shoot: Cave[y][x] = Yball_eat; Next[y][x] = Xblank; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.key_score; ply->anim = SPR_walk + anim; break; @@ -1052,7 +1083,7 @@ static void player(struct PLAYER *ply) case Xlenses: Cave[y][x] = Yball_eat; Next[y][x] = Xblank; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.lenses_score; lev.lenses_cnt = lev.lenses_time; ply->anim = SPR_walk + anim; @@ -1061,7 +1092,7 @@ static void player(struct PLAYER *ply) case Xmagnify: Cave[y][x] = Yball_eat; Next[y][x] = Xblank; - play_sound(x, y, SAMPLE_collect); + play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.magnify_score; lev.magnify_cnt = lev.magnify_time; ply->anim = SPR_walk + anim;