amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-26 00:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: add LiverySchemes as EnumBitSet

Browse Source
This commit is contained in:
Peter Nelson
2026-05-18 20:05:19 +01:00
committed by Peter Nelson
parent 81c07db934
commit 7d70a7b9e9
6 changed files with 58 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/newgrf.cpp
+8 -8
View File
@@ -492,10 +492,10 @@ void ResetNewGRFData()
/* Reset misc GRF features and train list display variables */
_misc_grf_features = {};
_loaded_newgrf_features.has_2CC = false;
_loaded_newgrf_features.used_liveries = 1 << LS_DEFAULT;
_loaded_newgrf_features.shore = ShoreReplacement::None;
_loaded_newgrf_features.tram = TramDepotReplacement::None;
_loaded_newgrf_features.has_2CC = false;
_loaded_newgrf_features.used_liveries = LS_DEFAULT;
_loaded_newgrf_features.shore = ShoreReplacement::None;
_loaded_newgrf_features.tram = TramDepotReplacement::None;
/* Clear all GRF overrides */
_grf_id_overrides.clear();
@@ -888,23 +888,23 @@ static void FinaliseEngineArray()
/* Skip wagons, there livery is defined via the engine */
if (e->type != VehicleType::Train || e->VehInfo<RailVehicleInfo>().railveh_type != RailVehicleType::Wagon) {
LiveryScheme ls = GetEngineLiveryScheme(e->index, EngineID::Invalid(), nullptr);
SetBit(_loaded_newgrf_features.used_liveries, ls);
_loaded_newgrf_features.used_liveries.Set(ls);
/* Note: For ships and roadvehicles we assume that they cannot be refitted between passenger and freight */
if (e->type == VehicleType::Train) {
SetBit(_loaded_newgrf_features.used_liveries, LS_FREIGHT_WAGON);
_loaded_newgrf_features.used_liveries.Set(LS_FREIGHT_WAGON);
switch (ls) {
case LS_STEAM:
case LS_DIESEL:
case LS_ELECTRIC:
case LS_MONORAIL:
case LS_MAGLEV:
SetBit(_loaded_newgrf_features.used_liveries, LS_PASSENGER_WAGON_STEAM + ls - LS_STEAM);
_loaded_newgrf_features.used_liveries.Set(LS_PASSENGER_WAGON_STEAM + ls - LS_STEAM);
break;
case LS_DMU:
case LS_EMU:
SetBit(_loaded_newgrf_features.used_liveries, LS_PASSENGER_WAGON_DIESEL + ls - LS_DMU);
_loaded_newgrf_features.used_liveries.Set(LS_PASSENGER_WAGON_DIESEL + ls - LS_DMU);
break;
default: NOT_REACHED();