miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Use EnumBitSet for RailTypes.

Browse Source
This commit is contained in:
Peter Nelson
2025-03-24 20:35:57 +00:00
committed by Peter Nelson
parent 732109e444
commit 47d078c033
14 changed files with 67 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pathfinder/follow_track.hpp
View File

@@ -333,7 +333,7 @@ protected:
/* rail transport is possible only on compatible rail types */
if (IsRailTT()) {
RailType rail_type = GetTileRailType(this->new_tile);
if (!HasBit(this->railtypes, rail_type)) {
if (!this->railtypes.Test(rail_type)) {
/* incompatible rail type */
this->err = EC_RAIL_ROAD_TYPE;
return false;

4
src/pathfinder/yapf/yapf_destrail.hpp
View File

@@ -22,12 +22,12 @@ public:
void SetDestination(const Train *v, bool override_rail_type = false)
{
this->compatible_railtypes = v->compatible_railtypes;
if (override_rail_type) this->compatible_railtypes |= GetRailTypeInfo(v->railtype)->compatible_railtypes;
if (override_rail_type) this->compatible_railtypes.Set(GetRailTypeInfo(v->railtype)->compatible_railtypes);
}
bool IsCompatibleRailType(RailType rt)
{
return HasBit(this->compatible_railtypes, rt);
return this->compatible_railtypes.Test(rt);
}
RailTypes GetCompatibleRailTypes() const