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

Revert bug inducing change

Browse Source
This commit is contained in:
Andreas Schmitt
2021-06-17 09:33:15 +02:00
committed by Jonathan G Rennison
parent b175203d54
commit 3e771dc18d
1 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/road.cpp
View File

@@ -843,8 +843,6 @@ static void PublicRoad_FoundEndNode(AyStar *aystar, OpenListNode *current)
static const int32 BASE_COST_PER_TILE = 1; // Cost for existing road or tunnel/bridge. static const int32 BASE_COST_PER_TILE = 1; // Cost for existing road or tunnel/bridge.
static const int32 COST_FOR_NEW_ROAD = 100; // Cost for building a new road. static const int32 COST_FOR_NEW_ROAD = 100; // Cost for building a new road.
static const int32 COST_FOR_NEW_BRIDGE = 500; // Cost for building a new bridge (per tile).
static const int32 COST_FOR_NEW_TUNNEL = 500; // Cost for building a new tunnel (per tile, with non-linear increase with length as in CmdBuildTunnel costs).
static const int32 COST_FOR_SLOPE = 50; // Additional cost if the road heads up or down a slope. static const int32 COST_FOR_SLOPE = 50; // Additional cost if the road heads up or down a slope.
/** AyStar callback for getting the cost of the current node. */ /** AyStar callback for getting the cost of the current node. */
@@ -852,40 +850,12 @@ static int32 PublicRoad_CalculateG(AyStar *, AyStarNode *current, OpenListNode *
{ {
int32 cost = 0; int32 cost = 0;
int32 distance = DistanceManhattan(parent->path.node.tile, current->tile); const int32 distance = DistanceManhattan(parent->path.node.tile, current->tile);
if (IsTileType(current->tile, MP_ROAD) || IsTileType(current->tile, MP_TUNNELBRIDGE)) { if (IsTileType(current->tile, MP_ROAD) || IsTileType(current->tile, MP_TUNNELBRIDGE)) {
cost += distance * BASE_COST_PER_TILE; cost += distance * BASE_COST_PER_TILE;
} else {
if (distance > 1) {
/* We are planning to build a bridge or tunnel. Make that much more expensive. */
const DiagDirection road_direction = DiagdirBetweenTiles(parent->path.node.tile, current->tile);
if (IsUpwardsSlope(GetTileSlope(parent->path.node.tile), road_direction)) {
/* Tunnel */
/* Prevent excessively long tunnels */
if (distance > 30) return AYSTAR_INVALID_NODE;
cost += 2 * COST_FOR_NEW_TUNNEL;
int32 middle_cost = 0;
int tiles_coef = 3;
int tiles_bump = 25;
for (int i = 1; i <= distance; i++) {
if (i == tiles_bump) {
tiles_coef++;
tiles_bump *= 2;
}
middle_cost += COST_FOR_NEW_TUNNEL;
middle_cost += middle_cost >> tiles_coef;
}
cost += middle_cost;
} else {
/* Bridge */
cost += distance * COST_FOR_NEW_BRIDGE;
}
} else { } else {
cost += distance * COST_FOR_NEW_ROAD; cost += distance * COST_FOR_NEW_ROAD;
}
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;
@@ -907,6 +877,11 @@ static int32 PublicRoad_CalculateG(AyStar *, AyStarNode *current, OpenListNode *
parent_node = current_node->parent; parent_node = current_node->parent;
} }
} }
if (distance > 1) {
// We are planning to build a bridge or tunnel. Make that a bit more expensive.
cost += 6 * COST_FOR_SLOPE;
}
} }
if (_settings_game.game_creation.build_public_roads == PRC_AVOID_CURVES && if (_settings_game.game_creation.build_public_roads == PRC_AVOID_CURVES &&