mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-25 05:04:07 +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

8
src/road_cmd.cpp
View File

@@ -116,7 +116,7 @@ void InitRoadTypes()
for (RoadType rt = ROADTYPE_BEGIN; rt != ROADTYPE_END; rt++) {
RoadTypeInfo *rti = &_roadtypes[rt];
ResolveRoadTypeGUISprites(rti);
if (HasBit(rti->flags, ROTF_HIDDEN)) SetBit(_roadtypes_hidden_mask, rt);
if (rti->flags.Test(RoadTypeFlag::Hidden)) SetBit(_roadtypes_hidden_mask, rt);
}
_sorted_roadtypes.clear();
@@ -141,7 +141,7 @@ RoadType AllocateRoadType(RoadTypeLabel label, RoadTramType rtt)
*rti = _original_roadtypes[(rtt == RTT_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD];
rti->label = label;
rti->alternate_labels.clear();
rti->flags = ROTFB_NONE;
rti->flags = {};
rti->introduction_date = CalendarTime::INVALID_DATE;
/* Make us compatible with ourself. */
@@ -1830,7 +1830,7 @@ static void DrawTile_Road(TileInfo *ti)
int relocation = GetCustomRoadSprite(rti, ti->tile, ROTSG_DEPOT);
bool default_gfx = relocation == 0;
if (default_gfx) {
if (HasBit(rti->flags, ROTF_CATENARY)) {
if (rti->flags.Test(RoadTypeFlag::Catenary)) {
if (_loaded_newgrf_features.tram == TRAMWAY_REPLACE_DEPOT_WITH_TRACK && road_rt == INVALID_ROADTYPE && !rti->UsesOverlay()) {
/* Sprites with track only work for default tram */
relocation = SPR_TRAMWAY_DEPOT_WITH_TRACK - SPR_ROAD_DEPOT;
@@ -1880,7 +1880,7 @@ void DrawRoadDepotSprite(int x, int y, DiagDirection dir, RoadType rt)
int relocation = GetCustomRoadSprite(rti, INVALID_TILE, ROTSG_DEPOT);
bool default_gfx = relocation == 0;
if (default_gfx) {
if (HasBit(rti->flags, ROTF_CATENARY)) {
if (rti->flags.Test(RoadTypeFlag::Catenary)) {
if (_loaded_newgrf_features.tram == TRAMWAY_REPLACE_DEPOT_WITH_TRACK && RoadTypeIsTram(rt) && !rti->UsesOverlay()) {
/* Sprites with track only work for default tram */
relocation = SPR_TRAMWAY_DEPOT_WITH_TRACK - SPR_ROAD_DEPOT;