X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=147da4aff72b564899e3155701d3ce52b8e03e7a;hb=728442c17249f1ca5bb6b6aedb85c2b4fe7b8454;hp=5107c0ffa300d4338261399931b0f8a1cc7ced92;hpb=0078fa1620abed262370083c0c6aa475a25e1b04;p=rocksndiamonds.git diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c index 5107c0ff..147da4af 100644 --- a/src/game_em/synchro_1.c +++ b/src/game_em/synchro_1.c @@ -18,7 +18,26 @@ static boolean player_killed(struct PLAYER *); void synchro_1(void) { - /* must test for death and actually kill separately */ +#if 1 + + int start_check_nr; + int i; + + game_em.any_player_moving = FALSE; + + /* must test for death and actually kill separately */ + + for (i = 0; i < MAX_PLAYERS; i++) + { + boolean ply_kill = player_killed(&ply[i]); + + if (ply[i].alive && ply_kill) + 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); @@ -27,10 +46,51 @@ void synchro_1(void) 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; + } + + start_check_nr = (RandomEM & 128 ? 0 : 1) * 2 + (RandomEM & 256 ? 0 : 1); + + for (i = 0; i < MAX_PLAYERS; i++) + { + int check_nr = (start_check_nr + i) % MAX_PLAYERS; + + if (ply[check_nr].alive) + check_player(&ply[check_nr]); + } + + for (i = 0; i < MAX_PLAYERS; i++) + { + if (!ply[i].alive) + continue; + + if (Cave[ply[i].oldy][ply[i].oldx] == Zplayer) + { + Cave[ply[i].oldy][ply[i].oldx] = Xblank; + Next[ply[i].oldy][ply[i].oldx] = Xblank; + } + + if (Cave[ply[i].y][ply[i].x] == Xblank) + { + Cave[ply[i].y][ply[i].x] = Zplayer; + Next[ply[i].y][ply[i].x] = Zplayer; + } + } + +#else + ply1.oldx = ply1.x; ply1.oldy = ply1.y; ply1.anim = SPR_still; @@ -38,7 +98,7 @@ void synchro_1(void) ply2.oldy = ply2.y; ply2.anim = SPR_still; - if (Random & 256) + if (RandomEM & 256) { if (ply1.alive) check_player(&ply1); if (ply2.alive) check_player(&ply2); @@ -78,18 +138,29 @@ void synchro_1(void) Next[ply2.y][ply2.x] = Zplayer; } } + +#endif } 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 0 + printf("::: %d: %d, %d\n", ply->num, x, y); +#endif if (!ply->alive) return FALSE; - if (lev.time_initial > 0 && lev.time == 0) +#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]) { @@ -203,8 +274,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; @@ -337,7 +408,7 @@ 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); + play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1); break; default: @@ -368,11 +439,11 @@ 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 anim = 0; int dx = 0, dy = 0; #if 0 @@ -484,7 +555,7 @@ 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; } @@ -515,6 +586,10 @@ 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 */ @@ -526,10 +601,10 @@ static void check_player(struct PLAYER *ply) 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 */ @@ -580,7 +655,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) 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); case Xboom_android: case Xboom_1: @@ -760,7 +835,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 +873,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 +911,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 +960,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 +1008,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 +1053,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 +1199,15 @@ 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); + play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1); + + lev.home--; - if (--lev.home == 0 && lev.time_initial > 0) /* game won */ +#if 0 + /* !!! CHECK SCORE CALCULATION !!! */ + if (lev.home == 0 && lev.time_initial > 0) /* game won */ lev.score += lev.time * lev.exit_score / 100; +#endif ply->anim = SPR_walk + anim; ply->x = x;