diff options
| author | terkhen <terkhen@openttd.org> | 2010-02-02 22:27:03 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2010-02-02 22:27:03 +0000 |
| commit | 2798fdf082a5372d3e6a60556af24871618287c7 (patch) | |
| tree | e1c6121f57b445719a26175e64c5b4f1a507bc22 | |
| parent | b02a522038446757ba7de6fc81f9c9a6d03e3545 (diff) | |
| download | openttd-2798fdf082a5372d3e6a60556af24871618287c7.tar.xz | |
(svn r18987) -Fix: [NoAI] Make building long rails fail for AIs if there is an obstacle in the way.
| -rw-r--r-- | src/ai/api/ai_rail.cpp | 2 | ||||
| -rw-r--r-- | src/ai/api/ai_rail.hpp | 1 | ||||
| -rw-r--r-- | src/rail_cmd.cpp | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/ai/api/ai_rail.cpp b/src/ai/api/ai_rail.cpp index 9b2974a30..ae349ccde 100644 --- a/src/ai/api/ai_rail.cpp +++ b/src/ai/api/ai_rail.cpp @@ -332,7 +332,7 @@ static uint32 SimulateDrag(TileIndex from, TileIndex tile, TileIndex *to) (::TileX(from) == ::TileX(tile) && ::TileX(tile) == ::TileX(to)) || (::TileY(from) == ::TileY(tile) && ::TileY(tile) == ::TileY(to))); - uint32 p2 = SimulateDrag(from, tile, &to); + uint32 p2 = SimulateDrag(from, tile, &to) | 1 << 8; return AIObject::DoCommand(tile, to, p2, CMD_BUILD_RAILROAD_TRACK); } diff --git a/src/ai/api/ai_rail.hpp b/src/ai/api/ai_rail.hpp index 7170412ba..e82d01ae9 100644 --- a/src/ai/api/ai_rail.hpp +++ b/src/ai/api/ai_rail.hpp @@ -380,6 +380,7 @@ public: * @exception AIRail::ERR_CROSSING_ON_ONEWAY_ROAD * @exception AIRoad::ERR_ROAD_WORKS_IN_PROGRESS * @exception AIError::ERR_ALREADY_BUILT + * @note Construction will fail if an obstacle is found between the start and end tiles. * @return Whether the rail has been/can be build or not. */ static bool BuildRail(TileIndex from, TileIndex tile, TileIndex to); diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 22e45c7b8..c9e2c3916 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -698,6 +698,7 @@ static CommandCost ValidateAutoDrag(Trackdir *trackdir, TileIndex start, TileInd * - p2 = (bit 0-3) - railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev) * - p2 = (bit 4-6) - track-orientation, valid values: 0-5 (Track enum) * - p2 = (bit 7) - 0 = build, 1 = remove tracks + * - p2 = (bit 8) - 0 = build up to an obstacle, 1 = fail if an obstacle is found (used for AIs). * @param text unused * @return the cost of this operation or an error */ @@ -721,7 +722,10 @@ static CommandCost CmdRailTrackHelper(TileIndex tile, DoCommandFlag flags, uint3 ret = DoCommand(tile, railtype, TrackdirToTrack(trackdir), flags, remove ? CMD_REMOVE_SINGLE_RAIL : CMD_BUILD_SINGLE_RAIL); if (ret.Failed()) { - if (_error_message != STR_ERROR_ALREADY_BUILT && !remove) break; + if (_error_message != STR_ERROR_ALREADY_BUILT && !remove) { + if (HasBit(p2, 8)) return CMD_ERROR; + break; + } _error_message = INVALID_STRING_ID; } else { total_cost.AddCost(ret); |