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

Use MayTownBuildBridgeType/BSCF_NOT_AVAILABLE_TOWN for bridge type check

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-06-17 17:01:47 +01:00
parent 96bfcd587b
commit 724474e435
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/road.cpp
View File

@@ -460,12 +460,11 @@ static TileIndex BuildBridge(PathNode *current, TileIndex end_tile = INVALID_TIL
assert(!build_bridge || (IsValidTile(end_tile) && GetTileSlope(start_tile) == ComplementSlope(GetTileSlope(end_tile)))); assert(!build_bridge || (IsValidTile(end_tile) && GetTileSlope(start_tile) == ComplementSlope(GetTileSlope(end_tile))));
std::vector<BridgeType> available_bridge_types; const uint length = GetTunnelBridgeLength(start_tile, end_tile);
// Only use the original first 13 bridge types since std::vector<BridgeType> available_bridge_types;
// there might be stuff like modular bridges etc in the other ones. for (BridgeType i = 0; i < MAX_BRIDGES; ++i) {
for (uint i = 0; i < 13; ++i) { if (MayTownBuildBridgeType(i) && CheckBridgeAvailability(i, length).Succeeded()) {
if (CheckBridgeAvailability(i, GetTunnelBridgeLength(start_tile, end_tile)).Succeeded()) {
available_bridge_types.push_back(i); available_bridge_types.push_back(i);
} }
} }
@@ -523,12 +522,11 @@ static TileIndex BuildRiverBridge(PathNode *current, const DiagDirection road_di
assert(!build_bridge || IsValidTile(end_tile)); assert(!build_bridge || IsValidTile(end_tile));
std::vector<BridgeType> available_bridge_types; const uint length = GetTunnelBridgeLength(start_tile, end_tile);
// Only use the original first 13 bridge types since std::vector<BridgeType> available_bridge_types;
// there might be stuff like modular bridges etc in the other ones. for (BridgeType i = 0; i < MAX_BRIDGES; ++i) {
for (uint i = 0; i < 13; ++i) { if (MayTownBuildBridgeType(i) && CheckBridgeAvailability(i, length).Succeeded()) {
if (CheckBridgeAvailability(i, GetTunnelBridgeLength(start_tile, end_tile)).Succeeded()) {
available_bridge_types.push_back(i); available_bridge_types.push_back(i);
} }
} }
@@ -860,7 +858,7 @@ static int32 PublicRoad_CalculateG(AyStar *, AyStarNode *current, OpenListNode *
if (GetTileZ(parent->path.node.tile) != GetTileZ(current->tile)) { if (GetTileZ(parent->path.node.tile) != GetTileZ(current->tile)) {
cost += COST_FOR_SLOPE; cost += COST_FOR_SLOPE;
auto current_node = &parent->path; auto current_node = &parent->path;
auto parent_node = parent->path.parent; auto parent_node = parent->path.parent;
@@ -869,11 +867,11 @@ static int32 PublicRoad_CalculateG(AyStar *, AyStarNode *current, OpenListNode *
if (current_node == nullptr || parent_node == nullptr) { if (current_node == nullptr || parent_node == nullptr) {
break; break;
} }
if (GetTileZ(current_node->node.tile) != GetTileZ(parent_node->node.tile)) { if (GetTileZ(current_node->node.tile) != GetTileZ(parent_node->node.tile)) {
cost += COST_FOR_SLOPE; cost += COST_FOR_SLOPE;
} }
current_node = parent_node; current_node = parent_node;
parent_node = current_node->parent; parent_node = current_node->parent;
} }