diff options
| author | tron <tron@openttd.org> | 2005-08-08 10:42:02 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-08-08 10:42:02 +0000 |
| commit | 7cca146b0aab88967abbb69918c553a98ca1e754 (patch) | |
| tree | ad3015373b2fad3f4100656b755a42cb13d6ab07 /tunnelbridge_cmd.c | |
| parent | cb10eab5fc69fa0a99ab9cd142b4f1c79c3d714f (diff) | |
| download | openttd-7cca146b0aab88967abbb69918c553a98ca1e754.tar.xz | |
(svn r2840) Remove 3 unnecessary strings (they're empty) and fix the alignment of the musick track display
Diffstat (limited to 'tunnelbridge_cmd.c')
| -rw-r--r-- | tunnelbridge_cmd.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c index 7472e7c61..1dbe6c9f1 100644 --- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -263,8 +263,6 @@ int32 CmdBuildBridge(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (ti_start.z != ti_end.z) return_cmd_error(STR_5009_LEVEL_LAND_OR_WATER_REQUIRED); - _error_message = STR_500C; - // Towns are not allowed to use bridges on slopes. allow_on_slopes = ((!_is_ai_player || _patches.ainew_active) @@ -503,8 +501,7 @@ static int32 DoBuildTunnel(int x, int y, int x2, int y2, uint32 flags, uint exc_ break; FindLandscapeHeight(&ti, x2, y2); - if (ti.z <= z) - return_cmd_error(STR_5002); + if (ti.z <= z) return CMD_ERROR; if (!_cheats.crossing_tunnels.value && !CheckTunnelInWay(ti.tile, z)) return CMD_ERROR; @@ -517,8 +514,7 @@ static int32 DoBuildTunnel(int x, int y, int x2, int y2, uint32 flags, uint exc_ } FindLandscapeHeight(&ti, x2, y2); - if (ti.z != z) - return_cmd_error(STR_5004); + if (ti.z != z) return CMD_ERROR; if (exc_tile != 1) { if ( (direction ? 6U : 3U) != ti.tileh) |