amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 12:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make RoadBits an EnumBitSet (#15476)

Browse Source
This commit is contained in:
Peter Nelson
2026-04-13 21:23:17 +01:00
committed by GitHub
parent a5a60c8615
commit b33b0d92a0
18 changed files with 268 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rail_cmd.cpp
+5 -5
View File
@@ -518,23 +518,23 @@ CommandCost CmdBuildSingleRail(DoCommandFlags flags, TileIndex tile, RailType ra
RoadBits road = GetRoadBits(tile, RoadTramType::Road);
RoadBits tram = GetRoadBits(tile, RoadTramType::Tram);
if ((track == TRACK_X && ((road | tram) & ROAD_X) == 0) ||
(track == TRACK_Y && ((road | tram) & ROAD_Y) == 0)) {
if ((track == TRACK_X && !(road | tram).Any(ROAD_X)) ||
(track == TRACK_Y && !(road | tram).Any(ROAD_Y))) {
Owner road_owner = GetRoadOwner(tile, RoadTramType::Road);
Owner tram_owner = GetRoadOwner(tile, RoadTramType::Tram);
/* Disallow breaking end-of-line of someone else
* so trams can still reverse on this tile. */
if (Company::IsValidID(tram_owner) && HasExactlyOneBit(tram)) {
if (Company::IsValidID(tram_owner) && tram.Count() == 1) {
ret = CheckOwnership(tram_owner);
if (ret.Failed()) return ret;
}
uint num_new_road_pieces = (road != ROAD_NONE) ? 2 - CountBits(road) : 0;
uint num_new_road_pieces = road.Any() ? 2 - road.Count() : 0;
if (num_new_road_pieces > 0) {
cost.AddCost(num_new_road_pieces * RoadBuildCost(roadtype_road));
}
uint num_new_tram_pieces = (tram != ROAD_NONE) ? 2 - CountBits(tram) : 0;
uint num_new_tram_pieces = tram.Any() ? 2 - tram.Count() : 0;
if (num_new_tram_pieces > 0) {
cost.AddCost(num_new_tram_pieces * RoadBuildCost(roadtype_tram));
}