X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=08a823a0b359d4ba6f22f7d2f103e66a45fe3f6f;hb=afeec80878187293b10f7dcdd6ff3c094cc97e5d;hp=147da4aff72b564899e3155701d3ce52b8e03e7a;hpb=3e71d06e9a97be7bb8c50c76717d08e5c46e0cc8;p=rocksndiamonds.git diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c index 147da4af..08a823a0 100644 --- a/src/game_em/synchro_1.c +++ b/src/game_em/synchro_1.c @@ -5,12 +5,11 @@ * 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" +#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); @@ -18,15 +17,13 @@ static boolean player_killed(struct PLAYER *); void synchro_1(void) { -#if 1 - int start_check_nr; int i; game_em.any_player_moving = FALSE; + game_em.any_player_snapping = FALSE; /* must test for death and actually kill separately */ - for (i = 0; i < MAX_PLAYERS; i++) { boolean ply_kill = player_killed(&ply[i]); @@ -35,30 +32,11 @@ void synchro_1(void) kill_player(&ply[i]); } -#else - - /* must test for death and actually kill separately */ - boolean ply1_kill = player_killed(&ply1); - boolean ply2_kill = player_killed(&ply2); - - if (ply1.alive && ply1_kill) - kill_player(&ply1); - if (ply2.alive && ply2_kill) - kill_player(&ply2); - -#endif - -#if 0 - ply1.alive = 1; /* debugging */ -#endif - -#if 1 - for (i = 0; i < MAX_PLAYERS; i++) { ply[i].oldx = ply[i].x; ply[i].oldy = ply[i].y; - ply[i].anim = SPR_still; + ply[i].anim = PLY_still; } start_check_nr = (RandomEM & 128 ? 0 : 1) * 2 + (RandomEM & 256 ? 0 : 1); @@ -88,58 +66,6 @@ void synchro_1(void) Next[ply[i].y][ply[i].x] = Zplayer; } } - -#else - - ply1.oldx = ply1.x; - ply1.oldy = ply1.y; - ply1.anim = SPR_still; - ply2.oldx = ply2.x; - ply2.oldy = ply2.y; - ply2.anim = SPR_still; - - if (RandomEM & 256) - { - if (ply1.alive) check_player(&ply1); - if (ply2.alive) check_player(&ply2); - } - else - { - if (ply2.alive) check_player(&ply2); - if (ply1.alive) check_player(&ply1); - } - - if (ply1.alive) - { - if (Cave[ply1.oldy][ply1.oldx] == Zplayer) - { - Cave[ply1.oldy][ply1.oldx] = Xblank; - Next[ply1.oldy][ply1.oldx] = Xblank; - } - - if (Cave[ply1.y][ply1.x] == Xblank) - { - Cave[ply1.y][ply1.x] = Zplayer; - Next[ply1.y][ply1.x] = Zplayer; - } - } - - if (ply2.alive) - { - if (Cave[ply2.oldy][ply2.oldx] == Zplayer) - { - Cave[ply2.oldy][ply2.oldx] = Xblank; - Next[ply2.oldy][ply2.oldx] = Xblank; - } - - if (Cave[ply2.y][ply2.x] == Xblank) - { - Cave[ply2.y][ply2.x] = Zplayer; - Next[ply2.y][ply2.x] = Zplayer; - } - } - -#endif } static boolean player_killed(struct PLAYER *ply) @@ -147,110 +73,101 @@ static boolean player_killed(struct PLAYER *ply) int x = ply->x; int y = ply->y; -#if 0 - printf("::: %d: %d, %d\n", ply->num, x, y); -#endif - if (!ply->alive) return FALSE; -#if 1 if (lev.killed_out_of_time && setup.time_limit) return TRUE; -#else - if (lev.time_initial > 0 && lev.time == 0 && setup.time_limit) - return TRUE; -#endif 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: + 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: + 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: + 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: + 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: @@ -281,125 +198,101 @@ static void kill_player(struct PLAYER *ply) 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; } @@ -408,17 +301,19 @@ static void kill_player(struct PLAYER *ply) case Xexit_1: case Xexit_2: case Xexit_3: - play_element_sound(x, y, SAMPLE_exit_leave, 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; } switch(Cave[y][x]) { -#if 1 +#if USE_CHANGED_ACID_STUFF case Xacid_1: case Xacid_2: case Xacid_3: @@ -443,99 +338,69 @@ static void check_player(struct PLAYER *ply) int oldy = ply->y; int x = oldx; int y = oldy; - 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 + game_em.last_player_direction[ply->num] = MV_NONE; -#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 (dx || dy) { - if (ply->joy_n) /* north */ - { - y--; - dy = -1; - anim = 0; - } - else if (ply->joy_e) /* east */ - { - x++; - dx = 1; - anim = 1; - } - else if (ply->joy_s) /* south */ + 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 = 2; - } - else if (ply->joy_w) /* west */ - { - x--; - dx = -1; - anim = 3; - } - } - else - { - if (ply->joy_w) /* west */ - { - x--; - dx = -1; - anim = 3; - } - else if (ply->joy_s) /* south */ - { - y++; - dy = 1; - anim = 2; - } - else if (ply->joy_e) /* east */ - { - x++; - dx = 1; - anim = 1; - } - else if (ply->joy_n) /* north */ - { - y--; - dy = -1; - anim = 0; + ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0; + + return; } } -#endif if (dx == 0 && dy == 0) { @@ -546,7 +411,7 @@ static void check_player(struct PLAYER *ply) 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--; } } @@ -562,7 +427,7 @@ static void check_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->dynamite_cnt = 0; /* reset dynamite timer if we move */ ply->joy_spin = !ply->joy_spin; if (ply->joy_snap == 0) /* player wants to move */ @@ -594,7 +459,7 @@ static void check_player(struct PLAYER *ply) } else /* player wants to snap */ { - player_digfield(ply, dx, dy); + game_em.any_player_snapping = player_digfield(ply, dx, dy); } } @@ -621,8 +486,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) { /* 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; #if 1 @@ -635,13 +500,13 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xfake_acid_7: case Xfake_acid_8: #endif - play_element_sound(x, y, SAMPLE_blank, Xblank); - ply->anim = SPR_walk + anim; + play_element_sound(x, y, SOUND_blank, Xblank); + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; -#if 1 +#if USE_CHANGED_ACID_STUFF case Xacid_1: case Xacid_2: case Xacid_3: @@ -650,32 +515,33 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_6: case Xacid_7: case Xacid_8: -#endif if (Cave[y-1][x+1] == Xblank) - Cave[y-1][x+1] = Yacid_splash_eB; + Cave[y-1][x+1] = Xacid_splash_e; if (Cave[y-1][x-1] == Xblank) - Cave[y-1][x-1] = Yacid_splash_wB; - play_element_sound(x, y, SAMPLE_acid, Xacid_1); + 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: -#if 0 + 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: @@ -685,7 +551,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_7: case Xacid_8: #endif - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; @@ -694,8 +560,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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; @@ -704,115 +570,117 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_eat; + Cave[y][x] = Ykey_1_blank; goto key_walk; case Xkey_2: ply->keys |= 0x02; - Cave[y][x] = Ykey_2_eat; + Cave[y][x] = Ykey_2_blank; goto key_walk; case Xkey_3: ply->keys |= 0x04; - Cave[y][x] = Ykey_3_eat; + Cave[y][x] = Ykey_3_blank; goto key_walk; case Xkey_4: ply->keys |= 0x08; - Cave[y][x] = Ykey_4_eat; + Cave[y][x] = Ykey_4_blank; goto key_walk; case Xkey_5: ply->keys |= 0x10; - Cave[y][x] = Ykey_5_eat; + Cave[y][x] = Ykey_5_blank; goto key_walk; case Xkey_6: ply->keys |= 0x20; - Cave[y][x] = Ykey_6_eat; + Cave[y][x] = Ykey_6_blank; goto key_walk; case Xkey_7: ply->keys |= 0x40; - Cave[y][x] = Ykey_7_eat; + Cave[y][x] = Ykey_7_blank; goto key_walk; case Xkey_8: ply->keys |= 0x80; - Cave[y][x] = Ykey_8_eat; + Cave[y][x] = Ykey_8_blank; goto key_walk; key_walk: 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] = Ylenses_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] = Ymagnify_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; @@ -832,15 +700,15 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_element_sound(x, y, SAMPLE_acid, Xacid_1); + 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; @@ -848,11 +716,11 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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: @@ -870,15 +738,15 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_element_sound(x, y, SAMPLE_acid, Xacid_1); + 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; @@ -886,11 +754,11 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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: @@ -908,15 +776,15 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_element_sound(x, y, SAMPLE_acid, Xacid_1); + 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; @@ -924,11 +792,11 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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: @@ -939,11 +807,11 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) { 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; @@ -957,26 +825,26 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_element_sound(x, y, SAMPLE_acid, Xacid_1); + 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: @@ -990,7 +858,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) if (dy) break; - ply->anim = SPR_push + anim; + ply->anim = PLY_push_n + anim; break; case Xballoon: @@ -1005,15 +873,15 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_element_sound(x, y, SAMPLE_acid, Xacid_1); + 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; @@ -1022,12 +890,12 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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: @@ -1050,15 +918,15 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_element_sound(x, y, SAMPLE_acid, Xacid_1); + 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) : @@ -1068,12 +936,12 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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: @@ -1138,14 +1006,14 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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; @@ -1167,22 +1035,22 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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; @@ -1190,8 +1058,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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; @@ -1199,17 +1067,12 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xexit_1: case Xexit_2: case Xexit_3: - play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1); - lev.home--; -#if 0 - /* !!! CHECK SCORE CALCULATION !!! */ - if (lev.home == 0 && lev.time_initial > 0) /* game won */ - lev.score += lev.time * lev.exit_score / 100; -#endif + if (lev.home == 0) + game_em.level_solved = TRUE; - ply->anim = SPR_walk + anim; + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; @@ -1228,111 +1091,113 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) /* fire is pressed */ case Xgrass: - Cave[y][x] = Ygrass_eat; + Cave[y][x] = Ygrass_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 Xdirt: - Cave[y][x] = Ydirt_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_eat; + Cave[y][x] = Ykey_1_blank; goto key_shoot; case Xkey_2: ply->keys |= 0x02; - Cave[y][x] = Ykey_2_eat; + Cave[y][x] = Ykey_2_blank; goto key_shoot; case Xkey_3: ply->keys |= 0x04; - Cave[y][x] = Ykey_3_eat; + Cave[y][x] = Ykey_3_blank; goto key_shoot; case Xkey_4: ply->keys |= 0x08; - Cave[y][x] = Ykey_4_eat; + Cave[y][x] = Ykey_4_blank; goto key_shoot; case Xkey_5: ply->keys |= 0x10; - Cave[y][x] = Ykey_5_eat; + Cave[y][x] = Ykey_5_blank; goto key_shoot; case Xkey_6: ply->keys |= 0x20; - Cave[y][x] = Ykey_6_eat; + Cave[y][x] = Ykey_6_blank; goto key_shoot; case Xkey_7: ply->keys |= 0x40; - Cave[y][x] = Ykey_7_eat; + Cave[y][x] = Ykey_7_blank; goto key_shoot; case Xkey_8: ply->keys |= 0x80; - Cave[y][x] = Ykey_8_eat; + Cave[y][x] = Ykey_8_blank; goto key_shoot; key_shoot: 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] = Ylenses_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] = Ymagnify_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: