X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame.c;h=7c151483999a4e80dab1dc57d82050ffdd7dd603;hb=1297f42d0bbb398393ce800eb81eec0fef412771;hp=ddd61c63ef9e270dc611d4ddb906091af265f620;hpb=ae719233fe30688d2090513200f915ec2f346ead;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index ddd61c63..7c151483 100644 --- a/src/game.c +++ b/src/game.c @@ -1683,28 +1683,28 @@ int GetElementFromGroupElement(int element) return element; } -static void IncrementPlayerSokobanFieldsNeeded(struct PlayerInfo *player) +static void IncrementSokobanFieldsNeeded(void) { if (level.sb_fields_needed) - player->sokoban_fields_still_needed++; + local_player->sokoban_fields_still_needed++; } -static void IncrementPlayerSokobanObjectsNeeded(struct PlayerInfo *player) +static void IncrementSokobanObjectsNeeded(void) { if (level.sb_objects_needed) - player->sokoban_objects_still_needed++; + local_player->sokoban_objects_still_needed++; } -static void DecrementPlayerSokobanFieldsNeeded(struct PlayerInfo *player) +static void DecrementSokobanFieldsNeeded(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 DecrementPlayerSokobanObjectsNeeded(struct PlayerInfo *player) +static void DecrementSokobanObjectsNeeded(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) @@ -1816,11 +1816,11 @@ static void InitField(int x, int y, boolean init_game) break; case EL_SOKOBAN_FIELD_EMPTY: - IncrementPlayerSokobanFieldsNeeded(local_player); + IncrementSokobanFieldsNeeded(); break; case EL_SOKOBAN_OBJECT: - IncrementPlayerSokobanObjectsNeeded(local_player); + IncrementSokobanObjectsNeeded(); break; case EL_STONEBLOCK: @@ -13972,16 +13972,16 @@ static int DigField(struct PlayerInfo *player, { Back[x][y] = EL_SOKOBAN_FIELD_EMPTY; - IncrementPlayerSokobanFieldsNeeded(local_player); - IncrementPlayerSokobanObjectsNeeded(local_player); + IncrementSokobanFieldsNeeded(); + IncrementSokobanObjectsNeeded(); } if (Feld[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY) { Back[nextx][nexty] = EL_SOKOBAN_FIELD_EMPTY; - DecrementPlayerSokobanFieldsNeeded(local_player); - DecrementPlayerSokobanObjectsNeeded(local_player); + DecrementSokobanFieldsNeeded(); + DecrementSokobanObjectsNeeded(); // sokoban object was pushed from empty field to sokoban field if (Back[x][y] == EL_EMPTY)