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

Simplify infrastructure updates in tunnel/bridge road/tram conversion

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-12-28 23:55:31 +00:00
parent 6a94f2f3e7
commit 2810c4fe65
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/road_cmd.cpp
View File

@@ -3024,14 +3024,16 @@ static void ConvertRoadTypeOwner(TileIndex tile, uint num_pieces, Owner owner, R
switch (owner) { switch (owner) {
case OWNER_NONE: case OWNER_NONE:
SetRoadOwner(tile, GetRoadTramType(to_type), (Owner)_current_company); SetRoadOwner(tile, GetRoadTramType(to_type), (Owner)_current_company);
UpdateCompanyRoadInfrastructure(to_type, _current_company, num_pieces); if (num_pieces > 0) UpdateCompanyRoadInfrastructure(to_type, _current_company, num_pieces);
break; break;
default: default:
c = Company::Get(owner); if (num_pieces > 0) {
c->infrastructure.road[from_type] -= num_pieces; c = Company::Get(owner);
c->infrastructure.road[to_type] += num_pieces; c->infrastructure.road[from_type] -= num_pieces;
DirtyCompanyInfrastructureWindows(c->index); c->infrastructure.road[to_type] += num_pieces;
DirtyCompanyInfrastructureWindows(c->index);
}
break; break;
} }
} }
@@ -3225,21 +3227,22 @@ CommandCost CmdConvertRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
/* Update the company infrastructure counters. */ /* Update the company infrastructure counters. */
SubtractRoadTunnelBridgeInfrastructure(tile, endtile);
if (owner == _current_company) { if (owner == _current_company) {
ConvertRoadTypeOwner(tile, tile_pieces, owner, from_type, to_type); ConvertRoadTypeOwner(tile, 0, owner, from_type, to_type);
if (include_middle) { if (include_middle) {
ConvertRoadTypeOwner(endtile, end_pieces, owner, from_type, to_type); ConvertRoadTypeOwner(endtile, 0, owner, from_type, to_type);
SetTunnelBridgeOwner(tile, endtile, _current_company); SetTunnelBridgeOwner(tile, endtile, _current_company);
} }
} else {
UpdateCompanyRoadInfrastructure(from_type, owner, -(int)(tile_pieces + end_pieces));
UpdateCompanyRoadInfrastructure(to_type, owner, tile_pieces + end_pieces);
} }
/* Perform the conversion */ /* Perform the conversion */
SetRoadType(tile, rtt, to_type); SetRoadType(tile, rtt, to_type);
if (include_middle) SetRoadType(endtile, rtt, to_type); if (include_middle) SetRoadType(endtile, rtt, to_type);
AddRoadTunnelBridgeInfrastructure(tile, endtile);
FindVehicleOnPos(tile, VEH_ROAD, &affected_rvs, &UpdateRoadVehPowerProc); FindVehicleOnPos(tile, VEH_ROAD, &affected_rvs, &UpdateRoadVehPowerProc);
FindVehicleOnPos(endtile, VEH_ROAD, &affected_rvs, &UpdateRoadVehPowerProc); FindVehicleOnPos(endtile, VEH_ROAD, &affected_rvs, &UpdateRoadVehPowerProc);