mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-25 13:14:19 +01:00
Code Issues Releases Wiki Activity

Codechange: Use separate RoadTypes mask to list road or tram roadtypes.

Browse Source 
This simplifies logic reduces ambiguity.
This commit is contained in:
Peter Nelson
2025-03-24 21:35:53 +00:00
committed by Peter Nelson
parent c105adcd96
commit 819e097d6e
5 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/road_cmd.cpp
View File

@@ -53,13 +53,9 @@ typedef std::vector<RoadVehicle *> RoadVehicleList;
RoadTypeInfo _roadtypes[ROADTYPE_END];
std::vector<RoadType> _sorted_roadtypes; ///< Sorted list of road types.
RoadTypes _roadtypes_hidden_mask;
/**
* Bitmap of road/tram types.
* Bit if set if a roadtype is tram.
*/
RoadTypes _roadtypes_type;
RoadTypes _roadtypes_hidden_mask; ///< Bitset of hidden roadtypes.
RoadTypes _roadtypes_road; ///< Bitset of road roadtypes.
RoadTypes _roadtypes_tram; ///< Bitset of tram roadtypes.
/**
* Reset all road type information to its default values.
@@ -72,7 +68,8 @@ void ResetRoadTypes()
std::fill(insert, std::end(_roadtypes), RoadTypeInfo{});
_roadtypes_hidden_mask = ROADTYPES_NONE;
_roadtypes_type = ROADTYPES_TRAM;
_roadtypes_road = ROADTYPES_ROAD;
_roadtypes_tram = ROADTYPES_TRAM;
}
void ResolveRoadTypeGUISprites(RoadTypeInfo *rti)
@@ -159,9 +156,9 @@ RoadType AllocateRoadType(RoadTypeLabel label, RoadTramType rtt)
/* Set bitmap of road/tram types */
if (rtt == RTT_TRAM) {
SetBit(_roadtypes_type, rt);
SetBit(_roadtypes_tram, rt);
} else {
ClrBit(_roadtypes_type, rt);
SetBit(_roadtypes_road, rt);
}
return rt;