X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=c5b2c456b4910ed38eae9452f42b29d4f17d1edb;hp=f7404f04b96652ccce4e7dad67c193946da331fa;hb=1e4a6b46371858fdb85052eec3e7143732ff91b5;hpb=51dcb2097c619c5f9ba924a7edb4a3bdd6a6986e diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c index f7404f04..c5b2c456 100644 --- a/src/game_em/synchro_1.c +++ b/src/game_em/synchro_1.c @@ -88,8 +88,13 @@ static boolean player_killed(struct PLAYER *ply) 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]) { @@ -1126,8 +1131,13 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xexit_3: play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1); - if (--lev.home == 0 && lev.time_initial > 0) /* game won */ + 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 ply->anim = SPR_walk + anim; ply->x = x;