mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-24 20:54:08 +01:00
Code Issues Releases Wiki Activity

Codechange: Use EnumBitSet for RoadTypeFlags and RailTypeFlags. (#13415)

Browse Source
This commit is contained in:
Peter Nelson
2025-01-30 22:08:51 +00:00
committed by GitHub
parent a4d23c072d
commit 917d5cc75d
13 changed files with 56 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_engine.cpp
View File

@@ -565,7 +565,7 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
case VEH_TRAIN: {
RailType rt = GetTileRailType(v->tile);
const RailTypeInfo *rti = GetRailTypeInfo(rt);
return ((rti->flags & RTFB_CATENARY) ? 0x200 : 0) |
return (rti->flags.Test(RailTypeFlag::Catenary) ? 0x200 : 0) |
(HasPowerOnRail(Train::From(v)->railtype, rt) ? 0x100 : 0) |
GetReverseRailTypeTranslation(rt, object->ro.grffile);
}
@@ -573,7 +573,7 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
case VEH_ROAD: {
RoadType rt = GetRoadType(v->tile, GetRoadTramType(RoadVehicle::From(v)->roadtype));
const RoadTypeInfo *rti = GetRoadTypeInfo(rt);
return ((rti->flags & ROTFB_CATENARY) ? 0x200 : 0) |
return (rti->flags.Test(RoadTypeFlag::Catenary) ? 0x200 : 0) |
0x100 |
GetReverseRoadTypeTranslation(rt, object->ro.grffile);
}