X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Flogic.c;h=9e3b690f2a9c6b70127f3645faaeeafc770fc0bc;hb=47ed33d197cbd8d560197cb364b759a2239dff98;hp=7774c1dba4490e04b987d51e91ac05307943a038;hpb=6b9e2be7de7ffe7020a0c47a59d717eccdccbceb;p=rocksndiamonds.git diff --git a/src/game_em/logic.c b/src/game_em/logic.c index 7774c1db..9e3b690f 100644 --- a/src/game_em/logic.c +++ b/src/game_em/logic.c @@ -7267,7 +7267,7 @@ static void handle_tile(int x, int y) } } -void logic_players(void) +static void logic_players(void) { int start_check_nr; int i; @@ -7290,6 +7290,9 @@ void logic_players(void) for (i = 0; i < MAX_PLAYERS; i++) { + if (!ply[i].alive) + continue; + /* check for wrap-around movement */ if (ply[i].x < lev.left || ply[i].x > lev.right - 1) @@ -7336,7 +7339,7 @@ void logic_players(void) } } -void logic_objects(void) +static void logic_objects(void) { int x, y; @@ -7365,7 +7368,7 @@ void logic_objects(void) lev.draw = temp; } -void logic_globals(void) +static void logic_globals(void) { int x; int y; @@ -7432,3 +7435,17 @@ void logic_globals(void) for (x = lev.left; x < lev.right; x++) next[x][y] = cave[x][y]; } + +void logic(void) +{ + if (frame == 0) + { + logic_players(); + logic_objects(); + } + + if (frame == 1) + { + logic_globals(); + } +}