X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=b390ad916e71dfeec0f108d8fa38d81edbdd9b7b;hp=5107c0ffa300d4338261399931b0f8a1cc7ced92;hb=99261bc36a147246e39cdc6d5ce9b098257c4d1b;hpb=0078fa1620abed262370083c0c6aa475a25e1b04 diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c index 5107c0ff..b390ad91 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,77 +17,66 @@ static boolean player_killed(struct PLAYER *); void synchro_1(void) { - /* 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); - -#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) check_player(&ply1); - if (ply2.alive) check_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) check_player(&ply2); - if (ply1.alive) check_player(&ply1); + ply[i].oldx = ply[i].x; + ply[i].oldy = ply[i].y; + ply[i].anim = SPR_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 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 FALSE; - if (lev.time_initial > 0 && lev.time == 0) + if (lev.killed_out_of_time && setup.time_limit) return TRUE; switch(Cave[y-1][x]) @@ -203,8 +191,8 @@ static boolean player_killed(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; @@ -219,9 +207,6 @@ static void kill_player(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y-1][x] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; case Xtank_n: @@ -233,9 +218,6 @@ static void kill_player(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y-1][x] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; } @@ -250,9 +232,6 @@ static void kill_player(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y][x+1] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; case Xtank_n: @@ -264,9 +243,6 @@ static void kill_player(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y][x+1] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; } @@ -281,9 +257,6 @@ static void kill_player(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y+1][x] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; case Xtank_n: @@ -295,9 +268,6 @@ static void kill_player(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y+1][x] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; } @@ -312,9 +282,6 @@ static void kill_player(struct PLAYER *ply) case Xbug_gos: case Xbug_gow: Cave[y][x-1] = Xboom_bug; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; case Xtank_n: @@ -326,9 +293,6 @@ static void kill_player(struct PLAYER *ply) case Xtank_gos: case Xtank_gow: Cave[y][x-1] = Xboom_bomb; -#if 0 - play_element_sound(x, y, SAMPLE_boom, Zplayer); -#endif break; } @@ -337,7 +301,9 @@ static void kill_player(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, SAMPLE_exit_leave, Xexit_1); break; default: @@ -347,7 +313,7 @@ static void kill_player(struct PLAYER *ply) switch(Cave[y][x]) { -#if 1 +#if USE_CHANGED_ACID_STUFF case Xacid_1: case Xacid_2: case Xacid_3: @@ -368,103 +334,73 @@ static void kill_player(struct PLAYER *ply) static void check_player(struct PLAYER *ply) { - unsigned int oldx = ply->x; - unsigned int oldy = ply->y; - register unsigned int x = oldx; - register unsigned int y = oldy; - unsigned int anim = 0; + int oldx = ply->x; + int oldy = ply->y; + int x = oldx; + int y = oldy; 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 */ + 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; - } - 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; + ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0; + + return; } } -#endif if (dx == 0 && dy == 0) { @@ -484,14 +420,14 @@ static void check_player(struct PLAYER *ply) ply->dynamite_cnt = 0; } - Random += 7; /* be a bit more random if the player doesn't 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 */ @@ -515,21 +451,25 @@ static void check_player(struct PLAYER *ply) 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 */ { - player_digfield(ply, dx, dy); + 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); - unsigned int oldx = ply->x; - unsigned int oldy = ply->y; - register unsigned int x = oldx + dx; - register unsigned int y = oldy + dy; + int oldx = ply->x; + int oldy = ply->y; + int x = oldx + dx; + int y = oldy + dy; boolean result = TRUE; if (!dx && !dy) /* no direction specified */ @@ -566,7 +506,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) ply->y = y; break; -#if 1 +#if USE_CHANGED_ACID_STUFF case Xacid_1: case Xacid_2: case Xacid_3: @@ -575,12 +515,12 @@ 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; if (Cave[y-1][x-1] == Xblank) Cave[y-1][x-1] = Yacid_splash_wB; - play_sound(x, y, SAMPLE_acid); + play_element_sound(x, y, SAMPLE_acid, Xacid_1); +#endif case Xboom_android: case Xboom_1: @@ -600,7 +540,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xtank_goe: case Xtank_gos: case Xtank_gow: -#if 0 + +#if !USE_CHANGED_ACID_STUFF case Xacid_1: case Xacid_2: case Xacid_3: @@ -642,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; @@ -654,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; @@ -760,7 +703,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_sound(x, y, SAMPLE_acid); + play_element_sound(x, y, SAMPLE_acid, Xacid_1); goto stone_walk; case Xblank: @@ -798,7 +741,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_sound(x, y, SAMPLE_acid); + play_element_sound(x, y, SAMPLE_acid, Xacid_1); goto bomb_walk; case Xblank: @@ -836,7 +779,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_sound(x, y, SAMPLE_acid); + play_element_sound(x, y, SAMPLE_acid, Xacid_1); goto nut_walk; case Xblank: @@ -885,7 +828,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_sound(x, y, SAMPLE_acid); + play_element_sound(x, y, SAMPLE_acid, Xacid_1); goto spring_walk; case Xblank: @@ -933,7 +876,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_sound(x, y, SAMPLE_acid); + play_element_sound(x, y, SAMPLE_acid, Xacid_1); goto balloon_walk; case Xblank: @@ -978,7 +921,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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_sound(x, y, SAMPLE_acid); + play_element_sound(x, y, SAMPLE_acid, Xacid_1); goto android_walk; case Xblank: @@ -1124,10 +1067,10 @@ 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, Xexit_1); + lev.home--; - if (--lev.home == 0 && lev.time_initial > 0) /* game won */ - lev.score += lev.time * lev.exit_score / 100; + if (lev.home == 0) + game_em.level_solved = TRUE; ply->anim = SPR_walk + anim; ply->x = x; @@ -1168,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; @@ -1178,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;