Merge remote-tracking branch 'upstream/master'

2014-03-23 19:04:54 +02:00
parent 61e8275ebf c8afee6f9c
commit 55a09da6b2
13 changed files with 44 additions and 35 deletions
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -45,7 +45,7 @@ void CcBuildAirport(const CommandCost &result, TileIndex tile, uint32 p1, uint32
 {
 	if (result.Failed()) return;

-	if (_settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT, tile);
+	if (_settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT_OTHER, tile);
 	if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
 }