summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/tree_cmd.cpp5
-rw-r--r--src/water_cmd.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index ae3b9bfd2..4ed47900f 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -621,16 +621,15 @@ static void TileLoopTreesAlps(TileIndex tile)
static void TileLoop_Trees(TileIndex tile)
{
if (GetTreeGround(tile) == TREE_GROUND_SHORE) {
- TileLoop_Water(tile); // Calls AmbientSoundEffectCallback
+ TileLoop_Water(tile);
} else {
switch (_settings_game.game_creation.landscape) {
case LT_TROPIC: TileLoopTreesDesert(tile); break;
case LT_ARCTIC: TileLoopTreesAlps(tile); break;
}
-
- AmbientSoundEffectCallback(tile);
}
+ AmbientSoundEffectCallback(tile);
TileLoopClearHelper(tile);
uint treeCounter = GetTreeCounter(tile);
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 18b791b42..bdf142a09 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -1071,7 +1071,7 @@ static void DoDryUp(TileIndex tile)
*/
void TileLoop_Water(TileIndex tile)
{
- AmbientSoundEffectCallback(tile);
+ if (IsTileType(tile, MP_WATER)) AmbientSoundEffectCallback(tile);
switch (GetFloodingBehaviour(tile)) {
case FLOOD_ACTIVE: