Merge remote-tracking branch 'upstream/master'

This commit is contained in:
pelya
2014-03-23 19:04:54 +02:00
13 changed files with 44 additions and 35 deletions

View File

@@ -40,7 +40,7 @@
void CcTerraform(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
{
if (result.Succeeded()) {
if (_settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT, tile);
if (_settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT_OTHER, tile);
} else {
extern TileIndex _terraform_err_tile;
SetRedErrorSquare(_terraform_err_tile);
@@ -88,7 +88,7 @@ static void GenerateRockyArea(TileIndex end, TileIndex start)
success = true;
}
if (success && _settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT, end);
if (success && _settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT_OTHER, end);
}
/**
@@ -414,7 +414,7 @@ static void CommonRaiseLowerBigLand(TileIndex tile, int mode)
if (ta.w == 0 || ta.h == 0) return;
if (_settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT, tile);
if (_settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT_OTHER, tile);
uint h;
if (mode != 0) {