projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed needless delay when relocating the player
[rocksndiamonds.git]
/
src
/
game_em
/
logic.c
diff --git
a/src/game_em/logic.c
b/src/game_em/logic.c
index 89de4ee59f8828232880b579cc0cebcee5d31d2e..a1afd71355f05055cbc43c4401ffa2a6603ff18c 100644
(file)
--- a/
src/game_em/logic.c
+++ b/
src/game_em/logic.c
@@
-6228,6
+6228,16
@@
void logic_1(void)
for (i = 0; i < MAX_PLAYERS; i++)
{
for (i = 0; i < MAX_PLAYERS; i++)
{
+ /* check for wrap-around movement */
+ if (ply[i].x < lev.left ||
+ ply[i].x > lev.right - 1)
+ {
+ ply[i].x = (ply[i].x < lev.left ? lev.right - 1 : lev.left);
+
+ game.centered_player_nr_next = i;
+ game.set_centered_player = TRUE;
+ }
+
ply[i].oldx = ply[i].x;
ply[i].oldy = ply[i].y;
ply[i].anim = PLY_still;
ply[i].oldx = ply[i].x;
ply[i].oldy = ply[i].y;
ply[i].anim = PLY_still;
@@
-6334,10
+6344,12
@@
void logic_3(void)
for (count = lev.amoeba_time; count--;)
{
for (count = lev.amoeba_time; count--;)
{
- x = lev.left - 1 + (random >> 10) %
CAVE_WIDTH
;
- y = lev.top - 1 + (random >> 20) %
CAVE_HEIGHT
;
+ x = lev.left - 1 + (random >> 10) %
(CAVE_WIDTH + 2)
;
+ y = lev.top - 1 + (random >> 20) %
(CAVE_HEIGHT + 2)
;
- Lamoeba(x, y);
+ if (x >= lev.left && x < lev.right &&
+ y >= lev.top && y < lev.bottom)
+ Lamoeba(x, y);
random = random * 129 + 1;
}
random = random * 129 + 1;
}