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

Codechange: Use EnumBitSet for callback masks.

Browse Source
This commit is contained in:
Peter Nelson
2025-01-30 19:32:41 +00:00
committed by Peter Nelson
parent 1dd4adc50c
commit 40aeedeade
47 changed files with 396 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vehicle.cpp
+2 -2
View File
@@ -2100,7 +2100,7 @@ static PaletteID GetEngineColourMap(EngineID engine_type, CompanyID company, Eng
const Engine *e = Engine::Get(engine_type);
/* Check if we should use the colour map callback */
if (HasBit(e->info.callback_mask, CBM_VEHICLE_COLOUR_REMAP)) {
if (e->info.callback_mask.Test(VehicleCallbackMask::ColourRemap)) {
uint16_t callback = GetVehicleCallback(CBID_VEHICLE_COLOUR_MAPPING, 0, 0, engine_type, v);
/* Failure means "use the default two-colour" */
if (callback != CALLBACK_FAILED) {
@@ -2676,7 +2676,7 @@ void Vehicle::UpdateVisualEffect(bool allow_power_change)
}
/* Check powered wagon / visual effect callback */
if (HasBit(e->info.callback_mask, CBM_VEHICLE_VISUAL_EFFECT)) {
if (e->info.callback_mask.Test(VehicleCallbackMask::VisualEffect)) {
uint16_t callback = GetVehicleCallback(CBID_VEHICLE_VISUAL_EFFECT, 0, 0, this->engine_type, this);
if (callback != CALLBACK_FAILED) {