X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=08a823a0b359d4ba6f22f7d2f103e66a45fe3f6f;hb=afeec80878187293b10f7dcdd6ff3c094cc97e5d;hp=a8ff691a2d65828392b9d1d53dc77861bba46bd7;hpb=f47cd4b09952aaf95d16542f6b53f2d8bf9e1d7d;p=rocksndiamonds.git diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c index a8ff691a..08a823a0 100644 --- a/src/game_em/synchro_1.c +++ b/src/game_em/synchro_1.c @@ -5,319 +5,294 @@ * large switch statement for tiles the player interacts with. */ -#include "tile.h" -#include "level.h" -#include "sample.h" -#include "display.h" +#include "main_em.h" -static void player(struct PLAYER *); -static int test(struct PLAYER *); -static void die(struct PLAYER *); +#define USE_CHANGED_ACID_STUFF 1 + +static void check_player(struct PLAYER *); +static void kill_player(struct PLAYER *); +static boolean player_digfield(struct PLAYER *, int, int); +static boolean player_killed(struct PLAYER *); void synchro_1(void) { - /* must test for death and actually kill separately */ - char ply1_kill = test(&ply1); - char ply2_kill = test(&ply2); - - if (ply1.alive && ply1_kill) - die(&ply1); - if (ply2.alive && ply2_kill) - die(&ply2); - -#if 0 - ply1.alive = 1; /* debugging */ -#endif + int start_check_nr; + int i; - ply1.oldx = ply1.x; - ply1.oldy = ply1.y; - ply1.anim = SPR_still; - ply2.oldx = ply2.x; - ply2.oldy = ply2.y; - ply2.anim = SPR_still; + game_em.any_player_moving = FALSE; + game_em.any_player_snapping = FALSE; - if (Random & 256) + /* must test for death and actually kill separately */ + for (i = 0; i < MAX_PLAYERS; i++) { - if (ply1.alive) player(&ply1); - if (ply2.alive) player(&ply2); + boolean ply_kill = player_killed(&ply[i]); + + if (ply[i].alive && ply_kill) + kill_player(&ply[i]); } - else + + for (i = 0; i < MAX_PLAYERS; i++) { - if (ply2.alive) player(&ply2); - if (ply1.alive) player(&ply1); + ply[i].oldx = ply[i].x; + ply[i].oldy = ply[i].y; + ply[i].anim = PLY_still; } - if (ply1.alive) + start_check_nr = (RandomEM & 128 ? 0 : 1) * 2 + (RandomEM & 256 ? 0 : 1); + + for (i = 0; i < MAX_PLAYERS; i++) { - if (Cave[ply1.oldy][ply1.oldx] == Zplayer) - { - Cave[ply1.oldy][ply1.oldx] = Xblank; - Next[ply1.oldy][ply1.oldx] = Xblank; - } + int check_nr = (start_check_nr + i) % MAX_PLAYERS; - if (Cave[ply1.y][ply1.x] == Xblank) - { - Cave[ply1.y][ply1.x] = Zplayer; - Next[ply1.y][ply1.x] = Zplayer; - } + if (ply[check_nr].alive) + check_player(&ply[check_nr]); } - if (ply2.alive) + for (i = 0; i < MAX_PLAYERS; i++) { - if (Cave[ply2.oldy][ply2.oldx] == Zplayer) + if (!ply[i].alive) + continue; + + if (Cave[ply[i].oldy][ply[i].oldx] == Zplayer) { - Cave[ply2.oldy][ply2.oldx] = Xblank; - Next[ply2.oldy][ply2.oldx] = Xblank; + Cave[ply[i].oldy][ply[i].oldx] = Xblank; + Next[ply[i].oldy][ply[i].oldx] = Xblank; } - if (Cave[ply2.y][ply2.x] == Xblank) + if (Cave[ply[i].y][ply[i].x] == Xblank) { - Cave[ply2.y][ply2.x] = Zplayer; - Next[ply2.y][ply2.x] = Zplayer; + Cave[ply[i].y][ply[i].x] = Zplayer; + Next[ply[i].y][ply[i].x] = Zplayer; } } } -static int test(struct PLAYER *ply) +static boolean player_killed(struct PLAYER *ply) { - register unsigned int x = ply->x; - register unsigned int y = ply->y; + int x = ply->x; + int y = ply->y; if (!ply->alive) - return 0; + return FALSE; - if (lev.time == 0) - return(1); + if (lev.killed_out_of_time && setup.time_limit) + return TRUE; switch(Cave[y-1][x]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: - case Xtank_n: - case Xtank_e: - case Xtank_s: - case Xtank_w: - case Xtank_gon: - case Xtank_goe: - case Xtank_gos: - case Xtank_gow: - return(1); + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: + return TRUE; } switch(Cave[y][x+1]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: - case Xtank_n: - case Xtank_e: - case Xtank_s: - case Xtank_w: - case Xtank_gon: - case Xtank_goe: - case Xtank_gos: - case Xtank_gow: - return(1); + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: + return TRUE; } switch(Cave[y+1][x]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: - case Xtank_n: - case Xtank_e: - case Xtank_s: - case Xtank_w: - case Xtank_gon: - case Xtank_goe: - case Xtank_gos: - case Xtank_gow: - return(1); + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: + return TRUE; } switch(Cave[y][x-1]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: - case Xtank_n: - case Xtank_e: - case Xtank_s: - case Xtank_w: - case Xtank_gon: - case Xtank_goe: - case Xtank_gos: - case Xtank_gow: - return(1); + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: + return TRUE; } switch(Cave[y][x]) { case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: + case Xacid_splash_e: + case Xacid_splash_w: case Zplayer: case Xdynamite_1: case Xdynamite_2: case Xdynamite_3: case Xdynamite_4: - return(0); +#if 1 + case Xfake_acid_1: + case Xfake_acid_2: + case Xfake_acid_3: + case Xfake_acid_4: + case Xfake_acid_5: + case Xfake_acid_6: + case Xfake_acid_7: + case Xfake_acid_8: +#endif + return FALSE; } - return(1); + return TRUE; } -static void die(struct PLAYER *ply) +static void kill_player(struct PLAYER *ply) { - register unsigned int x = ply->x; - register unsigned int y = ply->y; + int x = ply->x; + int y = ply->y; ply->alive = 0; switch(Cave[y-1][x]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: Cave[y-1][x] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; - case Xtank_n: - case Xtank_e: - case Xtank_s: - case Xtank_w: - case Xtank_gon: - case Xtank_goe: - case Xtank_gos: - case Xtank_gow: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: Cave[y-1][x] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; } switch(Cave[y][x+1]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: Cave[y][x+1] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; - case Xtank_n: - case Xtank_e: - case Xtank_s: - case Xtank_w: - case Xtank_gon: - case Xtank_goe: - case Xtank_gos: - case Xtank_gow: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: Cave[y][x+1] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; } switch(Cave[y+1][x]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: Cave[y+1][x] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; - case Xtank_n: - case Xtank_e: - case Xtank_s: - case Xtank_w: - case Xtank_gon: - case Xtank_goe: - case Xtank_gos: - case Xtank_gow: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: Cave[y+1][x] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; } switch(Cave[y][x-1]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: Cave[y][x-1] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; - case Xtank_n: - case Xtank_e: - case Xtank_s: - case Xtank_w: - case Xtank_gon: - case Xtank_goe: - case Xtank_gos: - case Xtank_gow: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: Cave[y][x-1] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; } @@ -326,85 +301,104 @@ static void die(struct PLAYER *ply) case Xexit_1: case Xexit_2: case Xexit_3: - play_element_sound(x, y, SAMPLE_exit, Xexit_1); + lev.exit_x = x; + lev.exit_y = y; + play_element_sound(x, y, SOUND_exit_leave, Xexit_1); break; default: - play_element_sound(x, y, SAMPLE_die, Zplayer); + play_element_sound(x, y, SOUND_die, Zplayer); break; } - Cave[y][x] = Xboom_1; - Boom[y][x] = Xblank; + switch(Cave[y][x]) + { +#if USE_CHANGED_ACID_STUFF + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + break; +#endif + + default: + Cave[y][x] = Xboom_1; + Boom[y][x] = Xblank; + break; + } } -static void player(struct PLAYER *ply) +static void check_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 */ + int oldx = ply->x; + int oldy = ply->y; + int x = oldx; + int y = oldy; int dx = 0, dy = 0; - if ((ply->joy_spin = !ply->joy_spin)) + game_em.last_player_direction[ply->num] = MV_NONE; + + if (ply->joy_w) /* west */ { - if (ply->joy_n) - { - y--; - dy = -1; - anim = 0; - /* north */ - } - else if (ply->joy_e) - { - x++; - dx = 1; - anim = 1; - /* east */ - } - else if (ply->joy_s) - { - y++; - dy = 1; - anim = 2; - /* south */ - } - else if (ply->joy_w) - { - x--; - dx = -1; - anim = 3; - /* west */ - } + x--; + dx = -1; } - else + else if (ply->joy_e) /* east */ { - if (ply->joy_w) - { - x--; - dx = -1; - anim = 3; - /* west */ - } - else if (ply->joy_s) - { - y++; - dy = 1; - anim = 2; - /* south */ - } - else if (ply->joy_e) - { - x++; - dx = 1; - anim = 1; - /* east */ - } - else if (ply->joy_n) + x++; + dx = 1; + } + + if (ply->joy_n) /* north */ + { + y--; + dy = -1; + } + else if (ply->joy_s) /* south */ + { + y++; + dy = 1; + } + + if (dx || dy) + { + int oldx = ply->x; + int oldy = ply->y; + int x = oldx + dx; + int y = oldy + dy; + boolean players_visible_before_move; + boolean players_visible_after_move; + boolean can_move; + + players_visible_before_move = checkIfAllPlayersFitToScreen(); + + ply->x = x; + ply->y = y; + + players_visible_after_move = checkIfAllPlayersFitToScreen(); + + /* + player is allowed to move only in the following cases: + - it is not needed to display all players (not focussed to all players) + - all players are (still or again) visible after the move + - some players were already outside visible screen area before the move + */ + can_move = (game.centered_player_nr != -1 || + players_visible_after_move || + !players_visible_before_move); + + ply->x = oldx; + ply->y = oldy; + + if (!can_move) { - y--; - dy = -1; - anim = 0; - /* north */ + ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0; + + return; } } @@ -412,12 +406,12 @@ static void player(struct PLAYER *ply) { 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_element_sound(x, y, SAMPLE_dynamite, Xdynamite_1); + play_element_sound(x, y, SOUND_dynamite, Xdynamite_1); ply->dynamite--; } } @@ -426,16 +420,65 @@ static void player(struct PLAYER *ply) ply->dynamite_cnt = 0; } - Random += 7; /* bit more random if we dont move */ + RandomEM += 7; /* be a bit more random if the player doesn't move */ return; } 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->dynamite_cnt = 0; /* reset dynamite timer if we move */ + ply->joy_spin = !ply->joy_spin; + + 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); + + game_em.any_player_moving = TRUE; + game_em.last_moving_player = ply->num; + game_em.last_player_direction[ply->num] = ply->last_move_dir; + } + } + else /* player wants to snap */ + { + game_em.any_player_snapping = 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); + int oldx = ply->x; + int oldy = ply->y; + int x = oldx + dx; + int y = oldy + dy; + boolean result = TRUE; - if (ply->joy_fire == 0) + 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]; @@ -443,34 +486,62 @@ static void player(struct PLAYER *ply) { /* fire is released */ case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: + case Xacid_splash_e: + case Xacid_splash_w: Cave[y][x] = Zplayer; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_blank, Xblank); - ply->anim = SPR_walk + anim; +#if 1 + case Xfake_acid_1: + case Xfake_acid_2: + case Xfake_acid_3: + case Xfake_acid_4: + case Xfake_acid_5: + case Xfake_acid_6: + case Xfake_acid_7: + case Xfake_acid_8: +#endif + play_element_sound(x, y, SOUND_blank, Xblank); + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; +#if USE_CHANGED_ACID_STUFF + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (Cave[y-1][x+1] == Xblank) + Cave[y-1][x+1] = Xacid_splash_e; + if (Cave[y-1][x-1] == Xblank) + Cave[y-1][x-1] = Xacid_splash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); +#endif + case Xboom_android: case Xboom_1: - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: - case Xtank_n: - case Xtank_e: - case Xtank_s: - case Xtank_w: - case Xtank_gon: - case Xtank_goe: - case Xtank_gos: - case Xtank_gow: + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: + +#if !USE_CHANGED_ACID_STUFF case Xacid_1: case Xacid_2: case Xacid_3: @@ -479,7 +550,8 @@ static void player(struct PLAYER *ply) case Xacid_6: case Xacid_7: case Xacid_8: - ply->anim = SPR_walk + anim; +#endif + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; @@ -488,8 +560,8 @@ 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_element_sound(x, y, SAMPLE_dirt, Xgrass); - ply->anim = SPR_walk + anim; + play_element_sound(x, y, SOUND_dirt, Xgrass); + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; @@ -498,108 +570,117 @@ 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_element_sound(x, y, SAMPLE_dirt, Xdirt); - ply->anim = SPR_walk + anim; + play_element_sound(x, y, SOUND_dirt, Xdirt); + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; case Xdiamond: case Xdiamond_pause: - Cave[y][x] = Ydiamond_eat; + Cave[y][x] = Ydiamond_blank; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.diamond_score; lev.required = lev.required < 3 ? 0 : lev.required - 3; - ply->anim = SPR_walk + anim; + game.snapshot.collected_item = TRUE; + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; case Xemerald: case Xemerald_pause: - Cave[y][x] = Yemerald_eat; + Cave[y][x] = Yemerald_blank; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.emerald_score; lev.required = lev.required < 1 ? 0 : lev.required - 1; - ply->anim = SPR_walk + anim; + game.snapshot.collected_item = TRUE; + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; case Xdynamite: - Cave[y][x] = Ydynamite_eat; + Cave[y][x] = Ydynamite_blank; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.dynamite_score; ply->dynamite = ply->dynamite > 9998 ? 9999 : ply->dynamite + 1; - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; case Xkey_1: ply->keys |= 0x01; + Cave[y][x] = Ykey_1_blank; goto key_walk; case Xkey_2: ply->keys |= 0x02; + Cave[y][x] = Ykey_2_blank; goto key_walk; case Xkey_3: ply->keys |= 0x04; + Cave[y][x] = Ykey_3_blank; goto key_walk; case Xkey_4: ply->keys |= 0x08; + Cave[y][x] = Ykey_4_blank; goto key_walk; case Xkey_5: ply->keys |= 0x10; + Cave[y][x] = Ykey_5_blank; goto key_walk; case Xkey_6: ply->keys |= 0x20; + Cave[y][x] = Ykey_6_blank; goto key_walk; case Xkey_7: ply->keys |= 0x40; + Cave[y][x] = Ykey_7_blank; goto key_walk; case Xkey_8: ply->keys |= 0x80; + Cave[y][x] = Ykey_8_blank; goto key_walk; key_walk: - Cave[y][x] = Yball_eat; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.key_score; - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; case Xlenses: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ylenses_blank; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.lenses_score; lev.lenses_cnt = lev.lenses_time; - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; case Xmagnify: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ymagnify_blank; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.magnify_score; lev.magnify_cnt = lev.magnify_time; - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; @@ -619,15 +700,15 @@ static void player(struct PLAYER *ply) case Xacid_7: case Xacid_8: if (Cave[y-1][x+dx+1] == Xblank) - Cave[y-1][x+dx+1] = Yacid_splash_eB; + Cave[y-1][x+dx+1] = Xacid_splash_e; if (Cave[y-1][x+dx-1] == Xblank) - Cave[y-1][x+dx-1] = Yacid_splash_wB; - play_sound(x, y, SAMPLE_acid); + Cave[y-1][x+dx-1] = Xacid_splash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); goto stone_walk; case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: + case Xacid_splash_e: + case Xacid_splash_w: Cave[y][x+dx] = dx > 0 ? Ystone_e : Ystone_w; Next[y][x+dx] = Xstone_pause; @@ -635,11 +716,11 @@ static void player(struct PLAYER *ply) Cave[y][x] = dx > 0 ? Ystone_eB : Ystone_wB; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_roll, Xstone); + play_element_sound(x, y, SOUND_roll, Xstone); ply->x = x; } - ply->anim = SPR_push + anim; + ply->anim = PLY_push_n + anim; break; case Xbomb: @@ -657,15 +738,15 @@ static void player(struct PLAYER *ply) case Xacid_7: case Xacid_8: if (Cave[y-1][x+dx+1] == Xblank) - Cave[y-1][x+dx+1] = Yacid_splash_eB; + Cave[y-1][x+dx+1] = Xacid_splash_e; if (Cave[y-1][x+dx-1] == Xblank) - Cave[y-1][x+dx-1] = Yacid_splash_wB; - play_sound(x, y, SAMPLE_acid); + Cave[y-1][x+dx-1] = Xacid_splash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); goto bomb_walk; case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: + case Xacid_splash_e: + case Xacid_splash_w: Cave[y][x+dx] = dx > 0 ? Ybomb_e : Ybomb_w; Next[y][x+dx] = Xbomb_pause; @@ -673,11 +754,11 @@ static void player(struct PLAYER *ply) Cave[y][x] = dx > 0 ? Ybomb_eB : Ybomb_wB; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_roll, Xbomb); + play_element_sound(x, y, SOUND_roll, Xbomb); ply->x = x; } - ply->anim = SPR_push + anim; + ply->anim = PLY_push_n + anim; break; case Xnut: @@ -695,15 +776,15 @@ static void player(struct PLAYER *ply) case Xacid_7: case Xacid_8: if (Cave[y-1][x+dx+1] == Xblank) - Cave[y-1][x+dx+1] = Yacid_splash_eB; + Cave[y-1][x+dx+1] = Xacid_splash_e; if (Cave[y-1][x+dx-1] == Xblank) - Cave[y-1][x+dx-1] = Yacid_splash_wB; - play_sound(x, y, SAMPLE_acid); + Cave[y-1][x+dx-1] = Xacid_splash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); goto nut_walk; case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: + case Xacid_splash_e: + case Xacid_splash_w: Cave[y][x+dx] = dx > 0 ? Ynut_e : Ynut_w; Next[y][x+dx] = Xnut_pause; @@ -711,11 +792,11 @@ static void player(struct PLAYER *ply) Cave[y][x] = dx > 0 ? Ynut_eB : Ynut_wB; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_roll, Xnut); + play_element_sound(x, y, SOUND_roll, Xnut); ply->x = x; } - ply->anim = SPR_push + anim; + ply->anim = PLY_push_n + anim; break; case Xspring: @@ -726,11 +807,11 @@ static void player(struct PLAYER *ply) { case Xalien: case Xalien_pause: - Cave[y][x] = dx > 0 ? Yspring_kill_eB : Yspring_kill_wB; - Cave[y][x+dx] = dx > 0 ? Yspring_kill_e : Yspring_kill_w; + Cave[y][x] = dx > 0 ? Yspring_alien_eB : Yspring_alien_wB; + Cave[y][x+dx] = dx > 0 ? Yspring_alien_e : Yspring_alien_w; Next[y][x] = Zplayer; Next[y][x+dx] = dx > 0 ? Xspring_e : Xspring_w; - play_element_sound(x, y, SAMPLE_slurp, Xalien); + play_element_sound(x, y, SOUND_slurp, Xalien); lev.score += lev.slurp_score; ply->x = x; break; @@ -744,26 +825,26 @@ static void player(struct PLAYER *ply) case Xacid_7: case Xacid_8: if (Cave[y-1][x+dx+1] == Xblank) - Cave[y-1][x+dx+1] = Yacid_splash_eB; + Cave[y-1][x+dx+1] = Xacid_splash_e; if (Cave[y-1][x+dx-1] == Xblank) - Cave[y-1][x+dx-1] = Yacid_splash_wB; - play_sound(x, y, SAMPLE_acid); + Cave[y-1][x+dx-1] = Xacid_splash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); goto spring_walk; case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: + case Xacid_splash_e: + case Xacid_splash_w: Cave[y][x+dx] = dx > 0 ? Yspring_e : Yspring_w; Next[y][x+dx] = dx > 0 ? Xspring_e : Xspring_w; spring_walk: Cave[y][x] = dx > 0 ? Yspring_eB : Yspring_wB; Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_roll, Xspring); + play_element_sound(x, y, SOUND_roll, Xspring); ply->x = x; } - ply->anim = SPR_push + anim; + ply->anim = PLY_push_n + anim; break; case Xspring_pause: @@ -777,7 +858,7 @@ static void player(struct PLAYER *ply) if (dy) break; - ply->anim = SPR_push + anim; + ply->anim = PLY_push_n + anim; break; case Xballoon: @@ -792,15 +873,15 @@ static void player(struct PLAYER *ply) case Xacid_7: case Xacid_8: if (Cave[y+dy-1][x+dx+1] == Xblank) - Cave[y+dy-1][x+dx+1] = Yacid_splash_eB; + Cave[y+dy-1][x+dx+1] = Xacid_splash_e; if (Cave[y+dy-1][x+dx-1] == Xblank) - Cave[y+dy-1][x+dx-1] = Yacid_splash_wB; - play_sound(x, y, SAMPLE_acid); + Cave[y+dy-1][x+dx-1] = Xacid_splash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); goto balloon_walk; case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: + case Xacid_splash_e: + case Xacid_splash_w: Cave[y+dy][x+dx] = (dy ? (dy < 0 ? Yballoon_n : Yballoon_s) : (dx > 0 ? Yballoon_e : Yballoon_w)); Next[y+dy][x+dx] = Xballoon; @@ -809,12 +890,12 @@ 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_element_sound(x, y, SAMPLE_push, Xballoon); + play_element_sound(x, y, SOUND_push, Xballoon); ply->x = x; ply->y = y; } - ply->anim = SPR_push + anim; + ply->anim = PLY_push_n + anim; break; case Xandroid: @@ -837,15 +918,15 @@ static void player(struct PLAYER *ply) case Xacid_7: case Xacid_8: if (Cave[y+dy-1][x+dx+1] == Xblank) - Cave[y+dy-1][x+dx+1] = Yacid_splash_eB; + Cave[y+dy-1][x+dx+1] = Xacid_splash_e; if (Cave[y+dy-1][x+dx-1] == Xblank) - Cave[y+dy-1][x+dx-1] = Yacid_splash_wB; - play_sound(x, y, SAMPLE_acid); + Cave[y+dy-1][x+dx-1] = Xacid_splash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); goto android_walk; case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: + case Xacid_splash_e: + case Xacid_splash_w: Cave[y+dy][x+dx] = (dy ? (dy < 0 ? Yandroid_n : Yandroid_s) : (dx > 0 ? Yandroid_e : Yandroid_w)); Next[y+dy][x+dx] = (dy ? (dy < 0 ? Xandroid_2_n : Xandroid_2_s) : @@ -855,12 +936,12 @@ 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_element_sound(x, y, SAMPLE_push, Xandroid); + play_element_sound(x, y, SOUND_push, Xandroid); ply->x = x; ply->y = y; } - ply->anim = SPR_push + anim; + ply->anim = PLY_push_n + anim; break; case Xdoor_1: @@ -925,14 +1006,14 @@ static void player(struct PLAYER *ply) Cave[y+dy][x+dx] = Zplayer; Next[y+dy][x+dx] = Zplayer; - play_element_sound(x, y, SAMPLE_door, element); - ply->anim = SPR_walk + anim; + play_element_sound(x, y, SOUND_door, element); + ply->anim = PLY_walk_n + anim; ply->x = x + dx; ply->y = y + dy; break; case Xwheel: - play_element_sound(x, y, SAMPLE_press, element); + play_element_sound(x, y, SOUND_press, element); lev.wheel_cnt = lev.wheel_time; lev.wheel_x = x; lev.wheel_y = y; @@ -954,22 +1035,22 @@ static void player(struct PLAYER *ply) lev.wind_direction = 3; goto wind_walk; - case Xwind_nesw: + case Xwind_any: lev.wind_direction = dy ? (dy < 0 ? 0 : 2) : (dx > 0 ? 1 : 3); goto wind_walk; wind_walk: - play_element_sound(x, y, SAMPLE_press, element); + play_element_sound(x, y, SOUND_press, element); lev.wind_cnt = lev.wind_time; break; case Xwind_stop: - play_element_sound(x, y, SAMPLE_press, element); + play_element_sound(x, y, SOUND_press, element); lev.wind_cnt = 0; break; case Xswitch: - play_element_sound(x, y, SAMPLE_press, element); + play_element_sound(x, y, SOUND_press, element); lev.ball_cnt = lev.ball_time; lev.ball_state = !lev.ball_state; break; @@ -977,8 +1058,8 @@ static void player(struct PLAYER *ply) case Xplant: Cave[y][x] = Yplant; Next[y][x] = Xplant; - play_element_sound(x, y, SAMPLE_blank, Xplant); - ply->anim = SPR_walk + anim; + play_element_sound(x, y, SOUND_blank, Xplant); + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; @@ -986,16 +1067,22 @@ static void player(struct PLAYER *ply) case Xexit_1: case Xexit_2: case Xexit_3: - 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; + lev.home--; + + if (lev.home == 0) + game_em.level_solved = TRUE; + + ply->anim = PLY_walk_n + 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]; @@ -1004,99 +1091,119 @@ static void player(struct PLAYER *ply) /* fire is pressed */ case Xgrass: + Cave[y][x] = Ygrass_blank; + Next[y][x] = Xblank; + play_element_sound(x, y, SOUND_dirt, element); + ply->anim = PLY_shoot_n + anim; + break; + case Xdirt: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ydirt_blank; Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_dirt, element); - ply->anim = SPR_spray + anim; + play_element_sound(x, y, SOUND_dirt, element); + ply->anim = PLY_shoot_n + anim; break; case Xdiamond: case Xdiamond_pause: - Cave[y][x] = Ydiamond_eat; + Cave[y][x] = Ydiamond_blank; Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.diamond_score; lev.required = lev.required < 3 ? 0 : lev.required - 3; - ply->anim = SPR_walk + anim; + game.snapshot.collected_item = TRUE; + ply->anim = PLY_walk_n + anim; break; case Xemerald: case Xemerald_pause: - Cave[y][x] = Yemerald_eat; + Cave[y][x] = Yemerald_blank; Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.emerald_score; lev.required = lev.required < 1 ? 0 : lev.required - 1; - ply->anim = SPR_walk + anim; + game.snapshot.collected_item = TRUE; + ply->anim = PLY_walk_n + anim; break; case Xdynamite: - Cave[y][x] = Ydynamite_eat; + Cave[y][x] = Ydynamite_blank; Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.dynamite_score; ply->dynamite = ply->dynamite > 9998 ? 9999 : ply->dynamite + 1; - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; break; case Xkey_1: ply->keys |= 0x01; + Cave[y][x] = Ykey_1_blank; goto key_shoot; case Xkey_2: ply->keys |= 0x02; + Cave[y][x] = Ykey_2_blank; goto key_shoot; case Xkey_3: ply->keys |= 0x04; + Cave[y][x] = Ykey_3_blank; goto key_shoot; case Xkey_4: ply->keys |= 0x08; + Cave[y][x] = Ykey_4_blank; goto key_shoot; case Xkey_5: ply->keys |= 0x10; + Cave[y][x] = Ykey_5_blank; goto key_shoot; case Xkey_6: ply->keys |= 0x20; + Cave[y][x] = Ykey_6_blank; goto key_shoot; case Xkey_7: ply->keys |= 0x40; + Cave[y][x] = Ykey_7_blank; goto key_shoot; case Xkey_8: ply->keys |= 0x80; + Cave[y][x] = Ykey_8_blank; goto key_shoot; key_shoot: - Cave[y][x] = Yball_eat; Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.key_score; - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; break; case Xlenses: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ylenses_blank; Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.lenses_score; lev.lenses_cnt = lev.lenses_time; - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; break; case Xmagnify: - Cave[y][x] = Yball_eat; + Cave[y][x] = Ymagnify_blank; Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + play_element_sound(x, y, SOUND_collect, element); lev.score += lev.magnify_score; lev.magnify_cnt = lev.magnify_time; - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; break; + + default: + result = FALSE; } } + + return result; }