projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed functions (after removing parameter in previous commit)
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index ddd61c63ef9e270dc611d4ddb906091af265f620..7c151483999a4e80dab1dc57d82050ffdd7dd603 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-1683,28
+1683,28
@@
int GetElementFromGroupElement(int element)
return element;
}
return element;
}
-static void Increment
PlayerSokobanFieldsNeeded(struct PlayerInfo *player
)
+static void Increment
SokobanFieldsNeeded(void
)
{
if (level.sb_fields_needed)
{
if (level.sb_fields_needed)
- player->sokoban_fields_still_needed++;
+
local_
player->sokoban_fields_still_needed++;
}
}
-static void Increment
PlayerSokobanObjectsNeeded(struct PlayerInfo *player
)
+static void Increment
SokobanObjectsNeeded(void
)
{
if (level.sb_objects_needed)
{
if (level.sb_objects_needed)
- player->sokoban_objects_still_needed++;
+
local_
player->sokoban_objects_still_needed++;
}
}
-static void Decrement
PlayerSokobanFieldsNeeded(struct PlayerInfo *player
)
+static void Decrement
SokobanFieldsNeeded(void
)
{
{
- if (player->sokoban_fields_still_needed > 0)
- player->sokoban_fields_still_needed--;
+ if (
local_
player->sokoban_fields_still_needed > 0)
+
local_
player->sokoban_fields_still_needed--;
}
}
-static void Decrement
PlayerSokobanObjectsNeeded(struct PlayerInfo *player
)
+static void Decrement
SokobanObjectsNeeded(void
)
{
{
- if (player->sokoban_objects_still_needed > 0)
- player->sokoban_objects_still_needed--;
+ if (
local_
player->sokoban_objects_still_needed > 0)
+
local_
player->sokoban_objects_still_needed--;
}
static void InitPlayerField(int x, int y, int element, boolean init_game)
}
static void InitPlayerField(int x, int y, int element, boolean init_game)
@@
-1816,11
+1816,11
@@
static void InitField(int x, int y, boolean init_game)
break;
case EL_SOKOBAN_FIELD_EMPTY:
break;
case EL_SOKOBAN_FIELD_EMPTY:
- Increment
PlayerSokobanFieldsNeeded(local_player
);
+ Increment
SokobanFieldsNeeded(
);
break;
case EL_SOKOBAN_OBJECT:
break;
case EL_SOKOBAN_OBJECT:
- Increment
PlayerSokobanObjectsNeeded(local_player
);
+ Increment
SokobanObjectsNeeded(
);
break;
case EL_STONEBLOCK:
break;
case EL_STONEBLOCK:
@@
-13972,16
+13972,16
@@
static int DigField(struct PlayerInfo *player,
{
Back[x][y] = EL_SOKOBAN_FIELD_EMPTY;
{
Back[x][y] = EL_SOKOBAN_FIELD_EMPTY;
- Increment
PlayerSokobanFieldsNeeded(local_player
);
- Increment
PlayerSokobanObjectsNeeded(local_player
);
+ Increment
SokobanFieldsNeeded(
);
+ Increment
SokobanObjectsNeeded(
);
}
if (Feld[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY)
{
Back[nextx][nexty] = EL_SOKOBAN_FIELD_EMPTY;
}
if (Feld[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY)
{
Back[nextx][nexty] = EL_SOKOBAN_FIELD_EMPTY;
- Decrement
PlayerSokobanFieldsNeeded(local_player
);
- Decrement
PlayerSokobanObjectsNeeded(local_player
);
+ Decrement
SokobanFieldsNeeded(
);
+ Decrement
SokobanObjectsNeeded(
);
// sokoban object was pushed from empty field to sokoban field
if (Back[x][y] == EL_EMPTY)
// sokoban object was pushed from empty field to sokoban field
if (Back[x][y] == EL_EMPTY)