dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Custom bridge heads: Relax ownership checks to be similar to plain roads.

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-02-05 18:44:27 +00:00
parent 0cd99e576c
commit 079a5a66da
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/road_cmd.cpp
View File

@@ -739,12 +739,6 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
CommandCost ret = TunnelBridgeIsFree(tile, other_end); CommandCost ret = TunnelBridgeIsFree(tile, other_end);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
/* check if this end is already owned by someone else */
const Owner owner = GetRoadOwner(tile, rt);
if (owner != OWNER_NONE) {
CommandCost ret = CheckOwnership(owner, tile);
if (ret.Failed()) return ret;
}
if ((existing | pieces) == entrance_piece) { if ((existing | pieces) == entrance_piece) {
/* /*
@@ -762,13 +756,6 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
if (added_pieces & entrance_piece) { if (added_pieces & entrance_piece) {
/* adding road to whole bridge */ /* adding road to whole bridge */
/* check if other end is already owned by someone else */
const Owner other_end_owner = GetRoadOwner(other_end, rt);
if (other_end_owner != OWNER_NONE) {
CommandCost ret = CheckOwnership(other_end_owner, other_end);
if (ret.Failed()) return ret;
}
other_end_added_pieces = MirrorRoadBits(entrance_piece); other_end_added_pieces = MirrorRoadBits(entrance_piece);
added_pieces_count += 1 + (GetTunnelBridgeLength(tile, other_end) * 2); added_pieces_count += 1 + (GetTunnelBridgeLength(tile, other_end) * 2);
@@ -791,11 +778,11 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
SubtractRoadTunnelBridgeInfrastructure(tile, other_end); SubtractRoadTunnelBridgeInfrastructure(tile, other_end);
SetRoadTypes(tile, GetRoadTypes(tile) | RoadTypeToRoadTypes(rt)); SetRoadTypes(tile, GetRoadTypes(tile) | RoadTypeToRoadTypes(rt));
SetRoadOwner(tile, rt, company); if (!existing) SetRoadOwner(tile, rt, company);
SetCustomBridgeHeadRoadBits(tile, rt, existing | pieces); SetCustomBridgeHeadRoadBits(tile, rt, existing | pieces);
if (other_end_added_pieces) { if (other_end_added_pieces) {
SetRoadTypes(other_end, GetRoadTypes(other_end) | RoadTypeToRoadTypes(rt)); SetRoadTypes(other_end, GetRoadTypes(other_end) | RoadTypeToRoadTypes(rt));
SetRoadOwner(other_end, rt, company); if (!other_end_existing) SetRoadOwner(other_end, rt, company);
SetCustomBridgeHeadRoadBits(other_end, rt, other_end_existing | other_end_added_pieces); SetCustomBridgeHeadRoadBits(other_end, rt, other_end_existing | other_end_added_pieces);
} }