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 Track a scoped enum and TrackBits an EnumBitSet (#15684)

Browse Source 
Helper methods to convert Track to TrackBits are removed as they are no longer necessary.
This commit is contained in:
Peter Nelson
2026-06-08 23:05:51 +01:00
committed by GitHub
parent 7e2bcaf792
commit c9cf141813
42 changed files with 607 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/newgrf_engine.cpp
+2 -2
View File
@@ -920,7 +920,7 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
case VehicleType::Train: {
Train *t = Train::From(v);
switch (variable - 0x80) {
case 0x62: return t->track;
case 0x62: return t->track.base();
case 0x66: return t->railtypes.GetNthSetBit(0).value_or(RailType::INVALID_RAILTYPE);
case 0x73: return 0x80 + VEHICLE_LENGTH - t->gcache.cached_veh_length;
case 0x74: return t->gcache.cached_power;
@@ -951,7 +951,7 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
case VehicleType::Ship: {
Ship *s = Ship::From(v);
switch (variable - 0x80) {
case 0x62: return s->state;
case 0x62: return s->state.base();
}
break;
}