X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=b390ad916e71dfeec0f108d8fa38d81edbdd9b7b;hp=3a469fdfcdb1f4a44d2cc811429aafd0703c779f;hb=99261bc36a147246e39cdc6d5ce9b098257c4d1b;hpb=7c0b78ef65acbe880d7f905a5e38fb7bdac8f007 diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c index 3a469fdf..b390ad91 100644 --- a/src/game_em/synchro_1.c +++ b/src/game_em/synchro_1.c @@ -8,14 +8,8 @@ #include "main_em.h" -#if 0 -extern int centered_player_nr; -#endif - #define USE_CHANGED_ACID_STUFF 1 -extern boolean checkIfAllPlayersFitToScreen(); - static void check_player(struct PLAYER *); static void kill_player(struct PLAYER *); static boolean player_digfield(struct PLAYER *, int, int); @@ -23,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]); @@ -40,25 +32,6 @@ 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; @@ -93,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) @@ -152,20 +73,11 @@ 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]) { @@ -295,11 +207,6 @@ static void kill_player(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y-1][x] = Xboom_bug; -#if 0 -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif -#endif break; case Xtank_n: @@ -311,11 +218,6 @@ static void kill_player(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y-1][x] = Xboom_bomb; -#if 0 -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif -#endif break; } @@ -330,11 +232,6 @@ static void kill_player(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y][x+1] = Xboom_bug; -#if 0 -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif -#endif break; case Xtank_n: @@ -346,11 +243,6 @@ static void kill_player(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y][x+1] = Xboom_bomb; -#if 0 -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif -#endif break; } @@ -365,11 +257,6 @@ static void kill_player(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y+1][x] = Xboom_bug; -#if 0 -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif -#endif break; case Xtank_n: @@ -381,11 +268,6 @@ static void kill_player(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y+1][x] = Xboom_bomb; -#if 0 -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif -#endif break; } @@ -400,11 +282,6 @@ static void kill_player(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y][x-1] = Xboom_bug; -#if 0 -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif -#endif break; case Xtank_n: @@ -416,11 +293,6 @@ static void kill_player(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y][x-1] = Xboom_bomb; -#if 0 -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif -#endif break; } @@ -435,9 +307,6 @@ static void kill_player(struct PLAYER *ply) break; default: -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif play_element_sound(x, y, SAMPLE_die, Zplayer); break; } @@ -469,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) { @@ -660,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); } } @@ -784,6 +583,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.diamond_score; lev.required = lev.required < 3 ? 0 : lev.required - 3; + game.snapshot.collected_item = TRUE; ply->anim = SPR_walk + anim; ply->x = x; ply->y = y; @@ -796,6 +596,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.emerald_score; lev.required = lev.required < 1 ? 0 : lev.required - 1; + game.snapshot.collected_item = TRUE; ply->anim = SPR_walk + anim; ply->x = x; ply->y = y; @@ -1266,18 +1067,10 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xexit_1: case Xexit_2: case Xexit_3: -#if 0 - /* !!! already played in kill_player !!! */ - play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1); -#endif - 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->x = x; @@ -1318,6 +1111,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.diamond_score; lev.required = lev.required < 3 ? 0 : lev.required - 3; + game.snapshot.collected_item = TRUE; ply->anim = SPR_walk + anim; break; @@ -1328,6 +1122,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) play_element_sound(x, y, SAMPLE_collect, element); lev.score += lev.emerald_score; lev.required = lev.required < 1 ? 0 : lev.required - 1; + game.snapshot.collected_item = TRUE; ply->anim = SPR_walk + anim; break;