projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060606-1-src
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index ed436b4ab836241c9c2149c7f9b6cd17b493924a..ac37d91eb997b8f8f9097c144c23d8a00fdc817b 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-8450,8
+8450,10
@@
static void CreateFieldExt(int x, int y, int element, boolean is_change)
#if USE_NEW_CUSTOM_VALUE
int last_ce_value = CustomValue[x][y];
#endif
#if USE_NEW_CUSTOM_VALUE
int last_ce_value = CustomValue[x][y];
#endif
- boolean add_player = (ELEM_IS_PLAYER(new_element) &&
- IS_WALKABLE(old_element));
+ boolean new_element_is_player = ELEM_IS_PLAYER(new_element);
+ boolean add_player_onto_element = (new_element_is_player &&
+ new_element != EL_SOKOBAN_FIELD_PLAYER &&
+ IS_WALKABLE(old_element));
#if 0
/* check if element under the player changes from accessible to unaccessible
#if 0
/* check if element under the player changes from accessible to unaccessible
@@
-8465,7
+8467,7
@@
static void CreateFieldExt(int x, int y, int element, boolean is_change)
}
#endif
}
#endif
- if (!add_player)
+ if (!add_player
_onto_element
)
{
if (IS_MOVING(x, y) || IS_BLOCKED(x, y))
RemoveMovingField(x, y);
{
if (IS_MOVING(x, y) || IS_BLOCKED(x, y))
RemoveMovingField(x, y);
@@
-8516,7
+8518,7
@@
static void CreateFieldExt(int x, int y, int element, boolean is_change)
#endif
/* "ChangeCount" not set yet to allow "entered by player" change one time */
#endif
/* "ChangeCount" not set yet to allow "entered by player" change one time */
- if (
ELEM_IS_PLAYER(new_element)
)
+ if (
new_element_is_player
)
RelocatePlayer(x, y, new_element);
if (is_change)
RelocatePlayer(x, y, new_element);
if (is_change)
@@
-11730,7
+11732,11
@@
int DigField(struct PlayerInfo *player,
if (player_can_move && element == EL_ACID && move_direction == MV_DOWN)
{
SplashAcid(x, y);
if (player_can_move && element == EL_ACID && move_direction == MV_DOWN)
{
SplashAcid(x, y);
+#if 1
+ Feld[jx][jy] = player->artwork_element;
+#else
Feld[jx][jy] = EL_PLAYER_1;
Feld[jx][jy] = EL_PLAYER_1;
+#endif
InitMovingField(jx, jy, MV_DOWN);
Store[jx][jy] = EL_ACID;
ContinueMoving(jx, jy);
InitMovingField(jx, jy, MV_DOWN);
Store[jx][jy] = EL_ACID;
ContinueMoving(jx, jy);