projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c845df1
)
renamed function
author
Holger Schemel
<info@artsoft.org>
Fri, 17 Aug 2018 10:40:26 +0000
(12:40 +0200)
committer
Holger Schemel
<info@artsoft.org>
Fri, 17 Aug 2018 10:40:26 +0000
(12:40 +0200)
src/game.c
patch
|
blob
|
history
diff --git
a/src/game.c
b/src/game.c
index c51b7ece8e596108139c1ebc94670c66497faa6a..2aa79df840c4cd417fa6edf55732a0258b1716c8 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-1112,7
+1112,7
@@
void TestIfGoodThingGetsHitByBadThing(int, int, int);
void KillPlayer(struct PlayerInfo *);
void BuryPlayer(struct PlayerInfo *);
void RemovePlayer(struct PlayerInfo *);
void KillPlayer(struct PlayerInfo *);
void BuryPlayer(struct PlayerInfo *);
void RemovePlayer(struct PlayerInfo *);
-void
RemovePlayerWithCleanup
(struct PlayerInfo *);
+void
ExitPlayer
(struct PlayerInfo *);
static int getInvisibleActiveFromInvisibleElement(int);
static int getInvisibleFromInvisibleActiveElement(int);
static int getInvisibleActiveFromInvisibleElement(int);
static int getInvisibleFromInvisibleActiveElement(int);
@@
-9776,7
+9776,7
@@
static void ExecuteCustomElementAction(int x, int y, int element, int page)
{
for (i = 0; i < MAX_PLAYERS; i++)
if (action_arg_player_bits & (1 << i))
{
for (i = 0; i < MAX_PLAYERS; i++)
if (action_arg_player_bits & (1 << i))
-
RemovePlayerWithCleanup
(&stored_player[i]);
+
ExitPlayer
(&stored_player[i]);
if (AllPlayersGone)
PlayerWins(local_player);
if (AllPlayersGone)
PlayerWins(local_player);
@@
-12645,7
+12645,7
@@
void ScrollPlayer(struct PlayerInfo *player, int mode)
Feld[jx][jy] == EL_SP_EXIT_OPEN ||
Feld[jx][jy] == EL_SP_EXIT_OPENING) /* <-- special case */
{
Feld[jx][jy] == EL_SP_EXIT_OPEN ||
Feld[jx][jy] == EL_SP_EXIT_OPENING) /* <-- special case */
{
-
RemovePlayerWithCleanup
(player);
+
ExitPlayer
(player);
if ((local_player->friends_still_needed == 0 ||
IS_SP_ELEMENT(Feld[jx][jy])) &&
if ((local_player->friends_still_needed == 0 ||
IS_SP_ELEMENT(Feld[jx][jy])) &&
@@
-13406,7
+13406,7
@@
void RemovePlayer(struct PlayerInfo *player)
ExitY = ZY = jy;
}
ExitY = ZY = jy;
}
-void
RemovePlayerWithCleanup
(struct PlayerInfo *player)
+void
ExitPlayer
(struct PlayerInfo *player)
{
DrawPlayer(player); /* needed here only to cleanup last field */
RemovePlayer(player);
{
DrawPlayer(player); /* needed here only to cleanup last field */
RemovePlayer(player);