diff options
| author | terkhen <terkhen@openttd.org> | 2010-06-04 19:50:37 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2010-06-04 19:50:37 +0000 |
| commit | f733c3795aa2b9c498ee9ca37ee55cab471094bf (patch) | |
| tree | c449cda660848de5a10dba577851742c89a227e0 | |
| parent | a78acadf3f1ee507cac261f95861eacab91c1369 (diff) | |
| download | openttd-f733c3795aa2b9c498ee9ca37ee55cab471094bf.tar.xz | |
(svn r19924) -Fix [FS#3868](r19172): Road/tram ownership was not set correctly when building drive-through stops.
| -rw-r--r-- | src/station_cmd.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 114eca1f2..bc9f48e94 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1683,8 +1683,6 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin bool reuse = (station_to_join != NEW_STATION); if (!reuse) station_to_join = INVALID_STATION; bool distant_join = (station_to_join != INVALID_STATION); - Owner tram_owner = _current_company; - Owner road_owner = _current_company; uint8 width = (uint8)GB(p1, 0, 8); uint8 lenght = (uint8)GB(p1, 8, 8); @@ -1780,6 +1778,9 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin RoadStopType rs_type = type ? ROADSTOP_TRUCK : ROADSTOP_BUS; if (is_drive_through) { + RoadTypes cur_rts = IsNormalRoadTile(cur_tile) ? GetRoadTypes(cur_tile) : ROADTYPES_NONE; + Owner road_owner = HasBit(cur_rts, ROADTYPE_ROAD) ? GetRoadOwner(cur_tile, ROADTYPE_ROAD) : _current_company; + Owner tram_owner = HasBit(cur_rts, ROADTYPE_TRAM) ? GetRoadOwner(cur_tile, ROADTYPE_TRAM) : _current_company; MakeDriveThroughRoadStop(cur_tile, st->owner, road_owner, tram_owner, st->index, rs_type, rts, DiagDirToAxis(ddir)); road_stop->MakeDriveThrough(); } else { |