projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20051228-2-src
[rocksndiamonds.git]
/
src
/
game_em
/
synchro_1.c
diff --git
a/src/game_em/synchro_1.c
b/src/game_em/synchro_1.c
index f7404f04b96652ccce4e7dad67c193946da331fa..124751d0ad312087bbf805251937df00481ef4eb 100644
(file)
--- a/
src/game_em/synchro_1.c
+++ b/
src/game_em/synchro_1.c
@@
-38,7
+38,7
@@
void synchro_1(void)
ply2.oldy = ply2.y;
ply2.anim = SPR_still;
ply2.oldy = ply2.y;
ply2.anim = SPR_still;
- if (Random & 256)
+ if (Random
EM
& 256)
{
if (ply1.alive) check_player(&ply1);
if (ply2.alive) check_player(&ply2);
{
if (ply1.alive) check_player(&ply1);
if (ply2.alive) check_player(&ply2);
@@
-88,8
+88,13
@@
static boolean player_killed(struct PLAYER *ply)
if (!ply->alive)
return FALSE;
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;
return TRUE;
+#endif
switch(Cave[y-1][x])
{
switch(Cave[y-1][x])
{
@@
-484,7
+489,7
@@
static void check_player(struct PLAYER *ply)
ply->dynamite_cnt = 0;
}
ply->dynamite_cnt = 0;
}
- Random
+= 7;
/* be a bit more random if the player doesn't move */
+ Random
EM += 7;
/* be a bit more random if the player doesn't move */
return;
}
return;
}
@@
-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);
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;
lev.score += lev.time * lev.exit_score / 100;
+#endif
ply->anim = SPR_walk + anim;
ply->x = x;
ply->anim = SPR_walk + anim;
ply->x = x;