(svn r23116) -Fix (r23114): Ambient sound effect callback was called for unsupported tile types.

pull/155/head
michi_cc 13 years ago
parent d10a5077d4
commit 109d15410e

@ -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);

@ -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:

Loading…
Cancel
Save