summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2011-11-04 22:59:23 +0000
committermichi_cc <michi_cc@openttd.org>2011-11-04 22:59:23 +0000
commit3e016e4254c6b8b558c50e7c66bc01ac6d118f4b (patch)
tree444a45868eac4742434bb34f00b1c4d44916271e /src
parentc8857d467903b9819c82d95a8967f53a55765db0 (diff)
downloadopenttd-3e016e4254c6b8b558c50e7c66bc01ac6d118f4b.tar.xz
(svn r23116) -Fix (r23114): Ambient sound effect callback was called for unsupported tile types.
Diffstat (limited to 'src')
-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: