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

Fix removing road from road/tram road stop incorrectly removing one-way state

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-03-17 17:05:52 +00:00
parent 2c8ec1bfaf
commit 29496772a1
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/road_cmd.cpp
View File

@@ -601,6 +601,15 @@ CommandCost CheckAllowRemoveRoad(TileIndex tile, RoadBits remove, Owner owner, R
return CommandCost(); return CommandCost();
} }
static void UpdateRoadStopTileDisallowedRoadDirection(TileIndex tile, DisallowedRoadDirections drd)
{
if (IsRoadWaypoint(tile)) {
SetDriveThroughStopDisallowedRoadDirections(tile, drd);
} else {
RoadStop *rs = RoadStop::GetByTile(tile, GetRoadStopType(tile));
rs->ChangeDriveThroughDisallowedRoadDirections(drd);
}
}
/** /**
* Delete a piece of road. * Delete a piece of road.
@@ -742,8 +751,8 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
/* A full diagonal road tile has two road bits. */ /* A full diagonal road tile has two road bits. */
UpdateCompanyRoadInfrastructure(existing_rt, GetRoadOwner(tile, rtt), -2); UpdateCompanyRoadInfrastructure(existing_rt, GetRoadOwner(tile, rtt), -2);
if (rtt == RTT_ROAD) { if (rtt == RTT_ROAD && GetDriveThroughStopDisallowedRoadDirections(tile) != DRD_NONE) {
SetDriveThroughStopDisallowedRoadDirections(tile, DRD_NONE); UpdateRoadStopTileDisallowedRoadDirection(tile, DRD_NONE);
} }
SetRoadType(tile, rtt, INVALID_ROADTYPE); SetRoadType(tile, rtt, INVALID_ROADTYPE);
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
@@ -1206,12 +1215,7 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32_t p1, uint3
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (IsRoadWaypoint(tile)) { UpdateRoadStopTileDisallowedRoadDirection(tile, dis_new);
SetDriveThroughStopDisallowedRoadDirections(tile, dis_new);
} else {
RoadStop *rs = RoadStop::GetByTile(tile, GetRoadStopType(tile));
rs->ChangeDriveThroughDisallowedRoadDirections(dis_new);
}
MarkTileDirtyByTile(tile, VMDF_NOT_MAP_MODE); MarkTileDirtyByTile(tile, VMDF_NOT_MAP_MODE);
NotifyRoadLayoutChanged(CountBits(dis_existing) > CountBits(dis_new)); NotifyRoadLayoutChanged(CountBits(dis_existing) > CountBits(dis_new));
UpdateRoadCachedOneWayStatesAroundTile(tile); UpdateRoadCachedOneWayStatesAroundTile(tile);