summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-11-12 21:48:55 +0000
committerrubidium <rubidium@openttd.org>2013-11-12 21:48:55 +0000
commit116adbc0e1e6cafd1b7fc2d5a85ef76a6dbd6e58 (patch)
tree7555d9e2661be89a597b892ea77ab08bf41fd882
parent5edda0149a96d1b6e475dac66e8434a539959f91 (diff)
downloadopenttd-116adbc0e1e6cafd1b7fc2d5a85ef76a6dbd6e58.tar.xz
(svn r25972) -Fix [FS#5665]: rail laying sounds of others could be heard in multiplayer (adf88)
-rw-r--r--src/rail_cmd.cpp2
-rw-r--r--src/rail_gui.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index e03889cf9..1b2d64d7f 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -843,8 +843,6 @@ static CommandCost CmdRailTrackHelper(TileIndex tile, DoCommandFlag flags, uint3
CommandCost ret = ValidateAutoDrag(&trackdir, tile, end_tile);
if (ret.Failed()) return ret;
- if ((flags & DC_EXEC) && _settings_client.sound.confirm) SndPlayTileFx(SND_20_SPLAT_2, tile);
-
bool had_success = false;
CommandCost last_error = CMD_ERROR;
for (;;) {
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 70f1a49de..5dafb83f8 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -352,7 +352,8 @@ static void DoRailroadTrack(int mode)
DoCommandP(TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), _cur_railtype | (mode << 4),
_remove_button_clicked ?
CMD_REMOVE_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK) :
- CMD_BUILD_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK));
+ CMD_BUILD_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK),
+ CcPlaySound1E);
}
static void HandleAutodirPlacement()