X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=3f7643fba41f2c28851dd27673c0c0d8a5c30293;hb=ec36fe263402351ac67b70400f11096a044365fe;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..3f7643fb 100644 --- a/src/game_em/synchro_1.c +++ b/src/game_em/synchro_1.c @@ -12,6 +12,7 @@ static void player(struct PLAYER *); +static boolean player_digfield(struct PLAYER *, int, int); static int test(struct PLAYER *); static void die(struct PLAYER *); @@ -84,8 +85,11 @@ static int test(struct PLAYER *ply) register unsigned int x = ply->x; register unsigned int y = ply->y; - if (lev.time == 0) - return(1); + if (!ply->alive) + return 0; + + if (lev.time_initial > 0 && lev.time == 0) + return 1; switch(Cave[y-1][x]) { @@ -105,7 +109,7 @@ static int test(struct PLAYER *ply) case Xtank_goe: case Xtank_gos: case Xtank_gow: - return(1); + return 1; } switch(Cave[y][x+1]) @@ -126,7 +130,7 @@ static int test(struct PLAYER *ply) case Xtank_goe: case Xtank_gos: case Xtank_gow: - return(1); + return 1; } switch(Cave[y+1][x]) @@ -147,7 +151,7 @@ static int test(struct PLAYER *ply) case Xtank_goe: case Xtank_gos: case Xtank_gow: - return(1); + return 1; } switch(Cave[y][x-1]) @@ -168,7 +172,7 @@ static int test(struct PLAYER *ply) case Xtank_goe: case Xtank_gos: case Xtank_gow: - return(1); + return 1; } switch(Cave[y][x]) @@ -181,10 +185,10 @@ static int test(struct PLAYER *ply) case Xdynamite_2: case Xdynamite_3: case Xdynamite_4: - return(0); + return 0; } - return(1); + return 1; } static void die(struct PLAYER *ply) @@ -205,6 +209,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 +223,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 +240,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 +254,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 +271,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 +285,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 +302,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 +316,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 +327,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; } @@ -313,84 +341,114 @@ static void die(struct PLAYER *ply) static void player(struct PLAYER *ply) { - register unsigned int x = ply->x; - register unsigned int y = ply->y; - unsigned int anim = 0; /* initialized to make compilers happy */ + unsigned int oldx = ply->x; + unsigned int oldy = ply->y; + register unsigned int x = oldx; + register unsigned int y = oldy; + unsigned int anim = 0; int dx = 0, dy = 0; +#if 0 + printf("::: up == %d, down == %d, left == %d, right == %d, fire == %d [spin == %d, stick == %d]\n", + ply->joy_n, ply->joy_s, ply->joy_w, ply->joy_e, ply->joy_fire, + ply->joy_spin, ply->joy_stick); +#endif + +#if 1 + if (ply->joy_w) /* west */ + { + x--; + dx = -1; + anim = 3; + } + else if (ply->joy_e) /* east */ + { + x++; + dx = 1; + anim = 1; + } + + if (ply->joy_n) /* north */ + { + y--; + dy = -1; + anim = 0; + } + else if (ply->joy_s) /* south */ + { + y++; + dy = 1; + anim = 2; + } + +#else + if ((ply->joy_spin = !ply->joy_spin)) { - if (ply->joy_n) + if (ply->joy_n) /* north */ { y--; dy = -1; anim = 0; - /* north */ } - else if (ply->joy_e) + else if (ply->joy_e) /* east */ { x++; dx = 1; anim = 1; - /* east */ } - else if (ply->joy_s) + else if (ply->joy_s) /* south */ { y++; dy = 1; anim = 2; - /* south */ } - else if (ply->joy_w) + else if (ply->joy_w) /* west */ { x--; dx = -1; anim = 3; - /* west */ } } else { - if (ply->joy_w) + if (ply->joy_w) /* west */ { x--; dx = -1; anim = 3; - /* west */ } - else if (ply->joy_s) + else if (ply->joy_s) /* south */ { y++; dy = 1; anim = 2; - /* south */ } - else if (ply->joy_e) + else if (ply->joy_e) /* east */ { x++; dx = 1; anim = 1; - /* east */ } - else if (ply->joy_n) + else if (ply->joy_n) /* north */ { y--; dy = -1; anim = 0; - /* north */ } } +#endif if (dx == 0 && dy == 0) { ply->joy_stick = 0; - if (ply->joy_fire) + if (ply->joy_drop) { 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--; } } @@ -399,7 +457,7 @@ static void player(struct PLAYER *ply) ply->dynamite_cnt = 0; } - Random += 7; /* bit more random if we dont move */ + Random += 7; /* be a bit more random if the player doesn't move */ return; } @@ -407,9 +465,56 @@ static void player(struct PLAYER *ply) ply->joy_stick = 1; ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0; ply->dynamite_cnt = 0; /* reset dynamite timer if we move */ + ply->joy_spin = !ply->joy_spin; - if (ply->joy_fire == 0) + if (ply->joy_snap == 0) /* player wants to move */ { + boolean moved = FALSE; + + if (ply->last_move_dir & MV_HORIZONTAL) + { + if (!(moved = player_digfield(ply, 0, dy))) + moved = player_digfield(ply, dx, 0); + } + else + { + if (!(moved = player_digfield(ply, dx, 0))) + moved = player_digfield(ply, 0, dy); + } + + if (moved) + { + if (oldx != ply->x) + ply->last_move_dir = (dx < 0 ? MV_LEFT : MV_RIGHT); + else if (oldy != ply->y) + ply->last_move_dir = (dy < 0 ? MV_UP : MV_DOWN); + } + } + else /* player wants to snap */ + { + player_digfield(ply, dx, dy); + } +} + +static boolean player_digfield(struct PLAYER *ply, int dx, int dy) +{ + int anim = (dx < 0 ? 3 : dx > 0 ? 1 : dy < 0 ? 0 : dy > 0 ? 2 : 2); + unsigned int oldx = ply->x; + unsigned int oldy = ply->y; + register unsigned int x = oldx + dx; + register unsigned int y = oldy + dy; + boolean result = TRUE; + + if (!dx && !dy) /* no direction specified */ + return FALSE; + + if (dx && dy && ply->joy_snap) /* more than one direction specified */ + return FALSE; + + if (ply->joy_snap == 0) /* player wants to move */ + { + int element = Cave[y][x]; + switch(Cave[y][x]) { /* fire is released */ @@ -418,7 +523,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 +564,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 +574,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 +584,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 +596,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 +607,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; @@ -512,41 +617,48 @@ static void player(struct PLAYER *ply) case Xkey_1: ply->keys |= 0x01; + Cave[y][x] = Ykey_1_eat; goto key_walk; case Xkey_2: ply->keys |= 0x02; + Cave[y][x] = Ykey_2_eat; goto key_walk; case Xkey_3: ply->keys |= 0x04; + Cave[y][x] = Ykey_3_eat; goto key_walk; case Xkey_4: ply->keys |= 0x08; + Cave[y][x] = Ykey_4_eat; goto key_walk; case Xkey_5: ply->keys |= 0x10; + Cave[y][x] = Ykey_5_eat; goto key_walk; case Xkey_6: ply->keys |= 0x20; + Cave[y][x] = Ykey_6_eat; goto key_walk; case Xkey_7: ply->keys |= 0x40; + Cave[y][x] = Ykey_7_eat; goto key_walk; case Xkey_8: ply->keys |= 0x80; + Cave[y][x] = Ykey_8_eat; goto key_walk; key_walk: - 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; @@ -554,9 +666,9 @@ static void player(struct PLAYER *ply) break; case Xlenses: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ylenses_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; @@ -565,9 +677,9 @@ static void player(struct PLAYER *ply) break; case Xmagnify: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ymagnify_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 +718,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 +756,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 +794,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 +813,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 +842,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 +892,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 +938,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 +1008,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 +1042,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 +1060,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,26 +1069,40 @@ static void player(struct PLAYER *ply) case Xexit_1: case Xexit_2: case Xexit_3: - play_sound(x, y, SAMPLE_exit); - if (--lev.home == 0) + play_element_sound(x, y, SAMPLE_exit, Xexit_1); + + if (--lev.home == 0 && lev.time_initial > 0) /* game won */ lev.score += lev.time * lev.exit_score / 100; + ply->anim = SPR_walk + anim; ply->x = x; ply->y = y; + break; } + + if (ply->x == oldx && ply->y == oldy) /* no movement */ + result = FALSE; } - else + else /* player wants to snap */ { + int element = Cave[y][x]; + switch(Cave[y][x]) { /* fire is pressed */ case Xgrass: + Cave[y][x] = Ygrass_eat; + Next[y][x] = Xblank; + play_element_sound(x, y, SAMPLE_dirt, element); + ply->anim = SPR_spray + anim; + break; + case Xdirt: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ydirt_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 +1110,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 +1120,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 +1129,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; @@ -1011,61 +1137,73 @@ static void player(struct PLAYER *ply) case Xkey_1: ply->keys |= 0x01; + Cave[y][x] = Ykey_1_eat; goto key_shoot; case Xkey_2: ply->keys |= 0x02; + Cave[y][x] = Ykey_2_eat; goto key_shoot; case Xkey_3: ply->keys |= 0x04; + Cave[y][x] = Ykey_3_eat; goto key_shoot; case Xkey_4: ply->keys |= 0x08; + Cave[y][x] = Ykey_4_eat; goto key_shoot; case Xkey_5: ply->keys |= 0x10; + Cave[y][x] = Ykey_5_eat; goto key_shoot; case Xkey_6: ply->keys |= 0x20; + Cave[y][x] = Ykey_6_eat; goto key_shoot; case Xkey_7: ply->keys |= 0x40; + Cave[y][x] = Ykey_7_eat; goto key_shoot; case Xkey_8: ply->keys |= 0x80; + Cave[y][x] = Ykey_8_eat; goto key_shoot; 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; case Xlenses: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ylenses_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; break; case Xmagnify: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ymagnify_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; break; + + default: + result = FALSE; } } + + return result; }