projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c1bebce
)
code cleanup
author
Holger Schemel
<info@artsoft.org>
Sat, 1 Apr 2023 00:39:00 +0000
(
02:39
+0200)
committer
Holger Schemel
<info@artsoft.org>
Sat, 1 Apr 2023 00:39:00 +0000
(
02:39
+0200)
src/game.c
patch
|
blob
|
history
diff --git
a/src/game.c
b/src/game.c
index dafcbbd47c8441f42cc99a351c062e821d6e8912..666d992d5c535f572dde2a4298f63211da230566 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-5405,17
+5405,9
@@
void Moving2Blocked(int x, int y, int *goes_to_x, int *goes_to_y)
void Blocked2Moving(int x, int y, int *comes_from_x, int *comes_from_y)
{
void Blocked2Moving(int x, int y, int *comes_from_x, int *comes_from_y)
{
- int oldx = x, oldy = y;
int direction = MovDir[x][y];
int direction = MovDir[x][y];
-
- if (direction == MV_LEFT)
- oldx++;
- else if (direction == MV_RIGHT)
- oldx--;
- else if (direction == MV_UP)
- oldy++;
- else if (direction == MV_DOWN)
- oldy--;
+ int oldx = x + (direction & MV_LEFT ? +1 : direction & MV_RIGHT ? -1 : 0);
+ int oldy = y + (direction & MV_UP ? +1 : direction & MV_DOWN ? -1 : 0);
*comes_from_x = oldx;
*comes_from_y = oldy;
*comes_from_x = oldx;
*comes_from_y = oldy;