X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=56d4c6ce17b18b468d6dc408906c160a8e33bb50;hb=a4c71d580965e41a96f02d4014357a941eeef2fb;hp=b45330149723e044c168e83d1ed99bf46bbdbe85;hpb=cfaefce799e67af6d8352f516a99d121b10d0cf6;p=rocksndiamonds.git diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c index b4533014..56d4c6ce 100644 --- a/src/game_em/synchro_1.c +++ b/src/game_em/synchro_1.c @@ -8,11 +8,7 @@ #include "main_em.h" -#if 0 -extern int centered_player_nr; -#endif - -extern boolean checkIfAllPlayersFitToScreen(); +#define USE_CHANGED_ACID_STUFF 1 static void check_player(struct PLAYER *); static void kill_player(struct PLAYER *); @@ -21,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]); @@ -38,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); @@ -79,70 +54,18 @@ void synchro_1(void) if (!ply[i].alive) continue; - if (Cave[ply[i].oldy][ply[i].oldx] == Zplayer) + if (Cave[ply[i].oldx][ply[i].oldy] == Zplayer) { - Cave[ply[i].oldy][ply[i].oldx] = Xblank; - Next[ply[i].oldy][ply[i].oldx] = Xblank; + Cave[ply[i].oldx][ply[i].oldy] = Xblank; + Next[ply[i].oldx][ply[i].oldy] = Xblank; } - if (Cave[ply[i].y][ply[i].x] == Xblank) + if (Cave[ply[i].x][ply[i].y] == Xblank) { - Cave[ply[i].y][ply[i].x] = Zplayer; - Next[ply[i].y][ply[i].x] = Zplayer; + Cave[ply[i].x][ply[i].y] = Zplayer; + Next[ply[i].x][ply[i].y] = 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) @@ -150,116 +73,107 @@ 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]) + switch(Cave[x][y-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+1]) + switch(Cave[x+1][y]) { - 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]) + switch(Cave[x][y+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-1]) + switch(Cave[x-1][y]) { - 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]) + switch(Cave[x][y]) { 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: -#if 1 +#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -282,146 +196,124 @@ static void kill_player(struct PLAYER *ply) ply->alive = 0; - switch(Cave[y-1][x]) + switch(Cave[x][y-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: - Cave[y-1][x] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif + 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[x][y-1] = Xboom_bug; 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: - Cave[y-1][x] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif + 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[x][y-1] = Xboom_bomb; break; } - switch(Cave[y][x+1]) + switch(Cave[x+1][y]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: - Cave[y][x+1] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif + 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[x+1][y] = Xboom_bug; 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: - Cave[y][x+1] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif + 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[x+1][y] = Xboom_bomb; break; } - switch(Cave[y+1][x]) + switch(Cave[x][y+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: - Cave[y+1][x] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif + 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[x][y+1] = Xboom_bug; 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: - Cave[y+1][x] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif + 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[x][y+1] = Xboom_bomb; break; } - switch(Cave[y][x-1]) + switch(Cave[x-1][y]) { - case Xbug_n: - case Xbug_e: - case Xbug_s: - case Xbug_w: - case Xbug_gon: - case Xbug_goe: - case Xbug_gos: - case Xbug_gow: - Cave[y][x-1] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif + 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[x-1][y] = Xboom_bug; 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: - Cave[y][x-1] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif + 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[x-1][y] = Xboom_bomb; break; } - switch(Cave[y][x]) + switch(Cave[x][y]) { 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]) + switch(Cave[x][y]) { -#if 1 +#if USE_CHANGED_ACID_STUFF case Xacid_1: case Xacid_2: case Xacid_3: @@ -434,8 +326,8 @@ static void kill_player(struct PLAYER *ply) #endif default: - Cave[y][x] = Xboom_1; - Boom[y][x] = Xblank; + Cave[x][y] = Xboom_1; + Boom[x][y] = Xblank; break; } } @@ -446,101 +338,31 @@ 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; game_em.last_player_direction[ply->num] = MV_NONE; -#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) /* north */ - { - y--; - dy = -1; - anim = 0; - } - else if (ply->joy_e) /* east */ - { - x++; - dx = 1; - anim = 1; - } - else if (ply->joy_s) /* south */ - { - 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; - } - } -#endif if (dx || dy) { @@ -588,8 +410,8 @@ 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); + Cave[x][y] = Xdynamite_1; + play_element_sound(x, y, SOUND_dynamite, Xdynamite_1); ply->dynamite--; } } @@ -637,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); } } @@ -658,17 +480,17 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) if (ply->joy_snap == 0) /* player wants to move */ { - int element = Cave[y][x]; + int element = Cave[x][y]; - switch(Cave[y][x]) + switch(Cave[x][y]) { /* fire is released */ case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: - Cave[y][x] = Zplayer; - Next[y][x] = Zplayer; -#if 1 + case Xacid_splash_e: + case Xacid_splash_w: + Cave[x][y] = Zplayer; + Next[x][y] = Zplayer; +#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -678,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: @@ -693,32 +515,33 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_6: case Xacid_7: case Xacid_8: + if (Cave[x+1][y-1] == Xblank) + Cave[x+1][y-1] = Xacid_splash_e; + if (Cave[x-1][y-1] == Xblank) + Cave[x-1][y-1] = Xacid_splash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); #endif - if (Cave[y-1][x+1] == Xblank) - Cave[y-1][x+1] = Yacid_splash_eB; - if (Cave[y-1][x-1] == Xblank) - Cave[y-1][x-1] = Yacid_splash_wB; - play_element_sound(x, y, SAMPLE_acid, Xacid_1); 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: @@ -728,134 +551,136 @@ 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; case Xgrass: - Cave[y][x] = (dy ? (dy < 0 ? Ygrass_nB : Ygrass_sB) : + Cave[x][y] = (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; + Next[x][y] = Zplayer; + play_element_sound(x, y, SOUND_dirt, Xgrass); + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; case Xdirt: - Cave[y][x] = (dy ? (dy < 0 ? Ydirt_nB : Ydirt_sB) : + Cave[x][y] = (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; + Next[x][y] = Zplayer; + 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; - Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Ydiamond_blank; + Next[x][y] = Zplayer; + 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; - Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Yemerald_blank; + Next[x][y] = Zplayer; + 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; - Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Ydynamite_blank; + Next[x][y] = Zplayer; + 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[x][y] = Ykey_1_blank; goto key_walk; case Xkey_2: ply->keys |= 0x02; - Cave[y][x] = Ykey_2_eat; + Cave[x][y] = Ykey_2_blank; goto key_walk; case Xkey_3: ply->keys |= 0x04; - Cave[y][x] = Ykey_3_eat; + Cave[x][y] = Ykey_3_blank; goto key_walk; case Xkey_4: ply->keys |= 0x08; - Cave[y][x] = Ykey_4_eat; + Cave[x][y] = Ykey_4_blank; goto key_walk; case Xkey_5: ply->keys |= 0x10; - Cave[y][x] = Ykey_5_eat; + Cave[x][y] = Ykey_5_blank; goto key_walk; case Xkey_6: ply->keys |= 0x20; - Cave[y][x] = Ykey_6_eat; + Cave[x][y] = Ykey_6_blank; goto key_walk; case Xkey_7: ply->keys |= 0x40; - Cave[y][x] = Ykey_7_eat; + Cave[x][y] = Ykey_7_blank; goto key_walk; case Xkey_8: ply->keys |= 0x80; - Cave[y][x] = Ykey_8_eat; + Cave[x][y] = Ykey_8_blank; goto key_walk; key_walk: - Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + Next[x][y] = Zplayer; + 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; - Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Ylenses_blank; + Next[x][y] = Zplayer; + 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; - Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Ymagnify_blank; + Next[x][y] = Zplayer; + 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; @@ -864,7 +689,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) if (dy) break; - switch(Cave[y][x+dx]) + switch(Cave[x+dx][y]) { case Xacid_1: case Xacid_2: @@ -874,35 +699,35 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_6: case Xacid_7: case Xacid_8: - if (Cave[y-1][x+dx+1] == Xblank) - Cave[y-1][x+dx+1] = Yacid_splash_eB; - 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); + if (Cave[x+dx+1][y-1] == Xblank) + Cave[x+dx+1][y-1] = Xacid_splash_e; + if (Cave[x+dx-1][y-1] == Xblank) + Cave[x+dx-1][y-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: - Cave[y][x+dx] = dx > 0 ? Ystone_e : Ystone_w; - Next[y][x+dx] = Xstone_pause; + case Xacid_splash_e: + case Xacid_splash_w: + Cave[x+dx][y] = dx > 0 ? Ystone_e : Ystone_w; + Next[x+dx][y] = Xstone_pause; stone_walk: - Cave[y][x] = dx > 0 ? Ystone_eB : Ystone_wB; - Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_roll, Xstone); + Cave[x][y] = dx > 0 ? Ystone_eB : Ystone_wB; + Next[x][y] = Zplayer; + 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: if (dy) break; - switch(Cave[y][x+dx]) + switch(Cave[x+dx][y]) { case Xacid_1: case Xacid_2: @@ -912,35 +737,35 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_6: case Xacid_7: case Xacid_8: - if (Cave[y-1][x+dx+1] == Xblank) - Cave[y-1][x+dx+1] = Yacid_splash_eB; - 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); + if (Cave[x+dx+1][y-1] == Xblank) + Cave[x+dx+1][y-1] = Xacid_splash_e; + if (Cave[x+dx-1][y-1] == Xblank) + Cave[x+dx-1][y-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: - Cave[y][x+dx] = dx > 0 ? Ybomb_e : Ybomb_w; - Next[y][x+dx] = Xbomb_pause; + case Xacid_splash_e: + case Xacid_splash_w: + Cave[x+dx][y] = dx > 0 ? Ybomb_e : Ybomb_w; + Next[x+dx][y] = Xbomb_pause; bomb_walk: - Cave[y][x] = dx > 0 ? Ybomb_eB : Ybomb_wB; - Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_roll, Xbomb); + Cave[x][y] = dx > 0 ? Ybomb_eB : Ybomb_wB; + Next[x][y] = Zplayer; + 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: if (dy) break; - switch(Cave[y][x+dx]) + switch(Cave[x+dx][y]) { case Xacid_1: case Xacid_2: @@ -950,43 +775,43 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_6: case Xacid_7: case Xacid_8: - if (Cave[y-1][x+dx+1] == Xblank) - Cave[y-1][x+dx+1] = Yacid_splash_eB; - 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); + if (Cave[x+dx+1][y-1] == Xblank) + Cave[x+dx+1][y-1] = Xacid_splash_e; + if (Cave[x+dx-1][y-1] == Xblank) + Cave[x+dx-1][y-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: - Cave[y][x+dx] = dx > 0 ? Ynut_e : Ynut_w; - Next[y][x+dx] = Xnut_pause; + case Xacid_splash_e: + case Xacid_splash_w: + Cave[x+dx][y] = dx > 0 ? Ynut_e : Ynut_w; + Next[x+dx][y] = Xnut_pause; nut_walk: - Cave[y][x] = dx > 0 ? Ynut_eB : Ynut_wB; - Next[y][x] = Zplayer; - play_element_sound(x, y, SAMPLE_roll, Xnut); + Cave[x][y] = dx > 0 ? Ynut_eB : Ynut_wB; + Next[x][y] = Zplayer; + 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: if (dy) break; - switch(Cave[y][x+dx]) + switch(Cave[x+dx][y]) { 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; - Next[y][x] = Zplayer; - Next[y][x+dx] = dx > 0 ? Xspring_e : Xspring_w; - play_element_sound(x, y, SAMPLE_slurp, Xalien); + Cave[x][y] = dx > 0 ? Yspring_alien_eB : Yspring_alien_wB; + Cave[x+dx][y] = dx > 0 ? Yspring_alien_e : Yspring_alien_w; + Next[x][y] = Zplayer; + Next[x+dx][y] = dx > 0 ? Xspring_e : Xspring_w; + play_element_sound(x, y, SOUND_slurp, Xalien); lev.score += lev.slurp_score; ply->x = x; break; @@ -999,27 +824,27 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_6: case Xacid_7: case Xacid_8: - if (Cave[y-1][x+dx+1] == Xblank) - Cave[y-1][x+dx+1] = Yacid_splash_eB; - 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); + if (Cave[x+dx+1][y-1] == Xblank) + Cave[x+dx+1][y-1] = Xacid_splash_e; + if (Cave[x+dx-1][y-1] == Xblank) + Cave[x+dx-1][y-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: - Cave[y][x+dx] = dx > 0 ? Yspring_e : Yspring_w; - Next[y][x+dx] = dx > 0 ? Xspring_e : Xspring_w; + case Xacid_splash_e: + case Xacid_splash_w: + Cave[x+dx][y] = dx > 0 ? Yspring_e : Yspring_w; + Next[x+dx][y] = 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); + Cave[x][y] = dx > 0 ? Yspring_eB : Yspring_wB; + Next[x][y] = Zplayer; + 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: @@ -1033,11 +858,11 @@ 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: - switch(Cave[y+dy][x+dx]) + switch(Cave[x+dx][y+dy]) { case Xacid_1: case Xacid_2: @@ -1047,30 +872,30 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_6: 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; - 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); + if (Cave[x+dx+1][y+dy-1] == Xblank) + Cave[x+dx+1][y+dy-1] = Xacid_splash_e; + if (Cave[x+dx-1][y+dy-1] == Xblank) + Cave[x+dx-1][y+dy-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: - Cave[y+dy][x+dx] = (dy ? (dy < 0 ? Yballoon_n : Yballoon_s) : + case Xacid_splash_e: + case Xacid_splash_w: + Cave[x+dx][y+dy] = (dy ? (dy < 0 ? Yballoon_n : Yballoon_s) : (dx > 0 ? Yballoon_e : Yballoon_w)); - Next[y+dy][x+dx] = Xballoon; + Next[x+dx][y+dy] = Xballoon; balloon_walk: - Cave[y][x] = (dy ? (dy < 0 ? Yballoon_nB : Yballoon_sB) : + Cave[x][y] = (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); + Next[x][y] = Zplayer; + 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: @@ -1082,7 +907,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xandroid_2_s: case Xandroid_1_w: case Xandroid_2_w: - switch(Cave[y+dy][x+dx]) + switch(Cave[x+dx][y+dy]) { case Xacid_1: case Xacid_2: @@ -1092,31 +917,31 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_6: 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; - 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); + if (Cave[x+dx+1][y+dy-1] == Xblank) + Cave[x+dx+1][y+dy-1] = Xacid_splash_e; + if (Cave[x+dx-1][y+dy-1] == Xblank) + Cave[x+dx-1][y+dy-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: - Cave[y+dy][x+dx] = (dy ? (dy < 0 ? Yandroid_n : Yandroid_s) : + case Xacid_splash_e: + case Xacid_splash_w: + Cave[x+dx][y+dy] = (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) : + Next[x+dx][y+dy] = (dy ? (dy < 0 ? Xandroid_2_n : Xandroid_2_s) : (dx > 0 ? Xandroid_2_e : Xandroid_2_w)); android_walk: - Cave[y][x] = (dy ? (dy < 0 ? Yandroid_nB : Yandroid_sB) : + Cave[x][y] = (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); + Next[x][y] = Zplayer; + 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: @@ -1176,19 +1001,19 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) break; door_walk: - if (!tab_blank[Cave[y+dy][x+dx]]) + if (!tab_blank[Cave[x+dx][y+dy]]) break; - 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; + Cave[x+dx][y+dy] = Zplayer; + Next[x+dx][y+dy] = Zplayer; + 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; @@ -1210,31 +1035,31 @@ 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; case Xplant: - Cave[y][x] = Yplant; - Next[y][x] = Xplant; - play_element_sound(x, y, SAMPLE_blank, Xplant); - ply->anim = SPR_walk + anim; + Cave[x][y] = Yplant; + Next[x][y] = Xplant; + play_element_sound(x, y, SOUND_blank, Xplant); + ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; @@ -1242,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; @@ -1264,118 +1084,120 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) } else /* player wants to snap */ { - int element = Cave[y][x]; + int element = Cave[x][y]; - switch(Cave[y][x]) + switch(Cave[x][y]) { /* 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; + Cave[x][y] = Ygrass_blank; + Next[x][y] = Xblank; + play_element_sound(x, y, SOUND_dirt, element); + ply->anim = PLY_shoot_n + anim; break; case Xdirt: - Cave[y][x] = Ydirt_eat; - Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_dirt, element); - ply->anim = SPR_spray + anim; + Cave[x][y] = Ydirt_blank; + Next[x][y] = Xblank; + 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; - Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Ydiamond_blank; + Next[x][y] = Xblank; + 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; - Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Yemerald_blank; + Next[x][y] = Xblank; + 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; - Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Ydynamite_blank; + Next[x][y] = Xblank; + 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[x][y] = Ykey_1_blank; goto key_shoot; case Xkey_2: ply->keys |= 0x02; - Cave[y][x] = Ykey_2_eat; + Cave[x][y] = Ykey_2_blank; goto key_shoot; case Xkey_3: ply->keys |= 0x04; - Cave[y][x] = Ykey_3_eat; + Cave[x][y] = Ykey_3_blank; goto key_shoot; case Xkey_4: ply->keys |= 0x08; - Cave[y][x] = Ykey_4_eat; + Cave[x][y] = Ykey_4_blank; goto key_shoot; case Xkey_5: ply->keys |= 0x10; - Cave[y][x] = Ykey_5_eat; + Cave[x][y] = Ykey_5_blank; goto key_shoot; case Xkey_6: ply->keys |= 0x20; - Cave[y][x] = Ykey_6_eat; + Cave[x][y] = Ykey_6_blank; goto key_shoot; case Xkey_7: ply->keys |= 0x40; - Cave[y][x] = Ykey_7_eat; + Cave[x][y] = Ykey_7_blank; goto key_shoot; case Xkey_8: ply->keys |= 0x80; - Cave[y][x] = Ykey_8_eat; + Cave[x][y] = Ykey_8_blank; goto key_shoot; key_shoot: - Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + Next[x][y] = Xblank; + 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; - Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Ylenses_blank; + Next[x][y] = Xblank; + 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; - Next[y][x] = Xblank; - play_element_sound(x, y, SAMPLE_collect, element); + Cave[x][y] = Ymagnify_blank; + Next[x][y] = Xblank; + 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: