projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060607-1-src
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index ed436b4ab836241c9c2149c7f9b6cd17b493924a..09eea8f3bf0c635affcf0b99b2916fe2c5378c75 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-44,6
+44,7
@@
#define USE_GFX_RESET_GFX_ANIMATION (USE_NEW_STUFF * 1)
#define USE_BOTH_SWITCHGATE_SWITCHES (USE_NEW_STUFF * 1)
#define USE_PLAYER_GRAVITY (USE_NEW_STUFF * 1)
#define USE_GFX_RESET_GFX_ANIMATION (USE_NEW_STUFF * 1)
#define USE_BOTH_SWITCHGATE_SWITCHES (USE_NEW_STUFF * 1)
#define USE_PLAYER_GRAVITY (USE_NEW_STUFF * 1)
+#define USE_FIXED_BORDER_RUNNING_GFX (USE_NEW_STUFF * 1)
#define USE_QUICKSAND_IMPACT_BUGFIX (USE_NEW_STUFF * 0)
#define USE_QUICKSAND_IMPACT_BUGFIX (USE_NEW_STUFF * 0)
@@
-1993,6
+1994,8
@@
void InitGame()
player->last_move_dir = MV_NONE;
player->last_move_dir = MV_NONE;
+ player->is_active = FALSE;
+
player->is_waiting = FALSE;
player->is_moving = FALSE;
player->is_auto_moving = FALSE;
player->is_waiting = FALSE;
player->is_moving = FALSE;
player->is_auto_moving = FALSE;
@@
-8450,8
+8453,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
+8470,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
+8521,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)
@@
-10585,6
+10590,8
@@
boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
player->move_delay_value = original_move_delay_value;
}
player->move_delay_value = original_move_delay_value;
}
+ player->is_active = FALSE;
+
if (player->last_move_dir & MV_HORIZONTAL)
{
if (!(moved |= MovePlayerOneStep(player, 0, dy, dx, dy)))
if (player->last_move_dir & MV_HORIZONTAL)
{
if (!(moved |= MovePlayerOneStep(player, 0, dy, dx, dy)))
@@
-10596,6
+10603,17
@@
boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
moved |= MovePlayerOneStep(player, 0, dy, dx, dy);
}
moved |= MovePlayerOneStep(player, 0, dy, dx, dy);
}
+#if USE_FIXED_BORDER_RUNNING_GFX
+ if (!moved && !player->is_active)
+ {
+ player->is_moving = FALSE;
+ player->is_digging = FALSE;
+ player->is_collecting = FALSE;
+ player->is_snapping = FALSE;
+ player->is_pushing = FALSE;
+ }
+#endif
+
jx = player->jx;
jy = player->jy;
jx = player->jx;
jy = player->jy;
@@
-11730,7
+11748,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);
@@
-12176,6
+12198,7
@@
int DigField(struct PlayerInfo *player,
}
player->is_pushing = TRUE;
}
player->is_pushing = TRUE;
+ player->is_active = TRUE;
if (!(IN_LEV_FIELD(nextx, nexty) &&
(IS_FREE(nextx, nexty) ||
if (!(IN_LEV_FIELD(nextx, nexty) &&
(IS_FREE(nextx, nexty) ||
@@
-12428,7
+12451,10
@@
int DigField(struct PlayerInfo *player,
if (is_player) /* function can also be called by EL_PENGUIN */
{
if (Feld[x][y] != element) /* really digged/collected something */
if (is_player) /* function can also be called by EL_PENGUIN */
{
if (Feld[x][y] != element) /* really digged/collected something */
+ {
player->is_collecting = !player->is_digging;
player->is_collecting = !player->is_digging;
+ player->is_active = TRUE;
+ }
}
return MP_MOVING;
}
return MP_MOVING;
@@
-12497,6
+12523,7
@@
boolean SnapField(struct PlayerInfo *player, int dx, int dy)
return FALSE;
player->is_snapping = TRUE;
return FALSE;
player->is_snapping = TRUE;
+ player->is_active = TRUE;
if (player->MovPos == 0)
{
if (player->MovPos == 0)
{