projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved global random variable for EM engine to game structure
[rocksndiamonds.git]
/
src
/
game_em
/
logic.c
diff --git
a/src/game_em/logic.c
b/src/game_em/logic.c
index 42166ebb9e802dc5a57b8ce0aa3f9f5135e3101e..73b2d94c21f98318f9de4633f5de9358218d3283 100644
(file)
--- a/
src/game_em/logic.c
+++ b/
src/game_em/logic.c
@@
-1313,7
+1313,8
@@
static void check_player(struct PLAYER *ply)
ply->dynamite_cnt = 0;
}
ply->dynamite_cnt = 0;
}
- RandomEM += 7; /* be a bit more random if the player doesn't move */
+ /* be a bit more random if the player doesn't move */
+ game_em.random += 7;
return;
}
return;
}
@@
-7157,7
+7158,8
@@
void logic_players(void)
ply[i].anim = PLY_still;
}
ply[i].anim = PLY_still;
}
- start_check_nr = (RandomEM & 128 ? 0 : 1) * 2 + (RandomEM & 256 ? 0 : 1);
+ start_check_nr = ((game_em.random & 128 ? 0 : 1) * 2 +
+ (game_em.random & 256 ? 0 : 1));
for (i = 0; i < MAX_PLAYERS; i++)
{
for (i = 0; i < MAX_PLAYERS; i++)
{
@@
-7194,7
+7196,7
@@
void logic_objects(void)
next = lev.next;
boom = lev.boom;
next = lev.next;
boom = lev.boom;
- seed =
RandomEM
;
+ seed =
game_em.random
;
score = 0;
for (y = lev.top; y < lev.bottom; y++)
score = 0;
for (y = lev.top; y < lev.bottom; y++)
@@
-7206,7
+7208,7
@@
void logic_objects(void)
else
game_em.game_over = TRUE;
else
game_em.game_over = TRUE;
-
RandomEM
= seed;
+
game_em.random
= seed;
/* triple buffering */
void *temp = lev.cave;
/* triple buffering */
void *temp = lev.cave;
@@
-7254,7
+7256,7
@@
void logic_globals(void)
/* grow amoeba */
/* grow amoeba */
- random =
RandomEM
;
+ random =
game_em.random
;
for (count = lev.amoeba_time; count--;)
{
for (count = lev.amoeba_time; count--;)
{
@@
-7268,7
+7270,7
@@
void logic_globals(void)
random = random * 129 + 1;
}
random = random * 129 + 1;
}
-
RandomEM
= random;
+
game_em.random
= random;
/* handle explosions */
/* handle explosions */