diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp --- a/src/clear_cmd.cpp +++ b/src/clear_cmd.cpp @@ -259,7 +259,7 @@ static void TileLoop_Clear(TileIndex til return; } } - AmbientSoundEffectCallback(tile); + AmbientSoundEffect(tile); switch (_settings_game.game_creation.landscape) { case LT_TROPIC: TileLoopClearDesert(tile); break; diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp --- a/src/newgrf_generic.cpp +++ b/src/newgrf_generic.cpp @@ -235,8 +235,6 @@ void AmbientSoundEffectCallback(TileInde { assert(IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES) || IsTileType(tile, MP_WATER)); - /* Only run callback if enabled. */ - if (!HasGrfMiscBit(GMB_AMBIENT_SOUND_CALLBACK)) return; /* Only run every 1/200-th time. */ uint32 r; // Save for later if (!Chance16R(1, 200, r)) return; diff --git a/src/newgrf_generic.h b/src/newgrf_generic.h --- a/src/newgrf_generic.h +++ b/src/newgrf_generic.h @@ -51,6 +51,15 @@ void ResetGenericCallbacks(); void AddGenericCallback(uint8 feature, const GRFFile *file, const SpriteGroup *group); uint16 GetAiPurchaseCallbackResult(uint8 feature, CargoID cargo_type, uint8 default_selection, IndustryType src_industry, IndustryType dst_industry, uint8 distance, AIConstructionEvent event, uint8 count, uint8 station_size, const GRFFile **file); -void AmbientSoundEffectCallback(TileIndex tile); + +/** Play an ambient sound effect for an empty tile. */ +static inline void AmbientSoundEffect(TileIndex tile) +{ + /* Only run callback if enabled. */ + if (!HasGrfMiscBit(GMB_AMBIENT_SOUND_CALLBACK)) return; + + extern void AmbientSoundEffectCallback(TileIndex tile); + AmbientSoundEffectCallback(tile); +} #endif /* NEWGRF_GENERIC_H */ diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -627,7 +627,7 @@ static void TileLoop_Trees(TileIndex til } } - AmbientSoundEffectCallback(tile); + AmbientSoundEffect(tile); uint treeCounter = GetTreeCounter(tile); diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -1143,7 +1143,7 @@ static void DoDryUp(TileIndex tile) */ void TileLoop_Water(TileIndex tile) { - if (IsTileType(tile, MP_WATER)) AmbientSoundEffectCallback(tile); + if (IsTileType(tile, MP_WATER)) AmbientSoundEffect(tile); switch (GetFloodingBehaviour(tile)) { case FLOOD_ACTIVE: