mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-17 09:22:42 +01:00
Code Issues Releases Wiki Activity

Codechange: Turn GetCustom(Vehicle|Rotor)(Sprite|Icon) macros into functions.

Browse Source
This commit is contained in:
frosch
2025-04-17 16:37:29 +02:00
committed by frosch
parent 8f8e997575
commit 8f335a84cf
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/newgrf_engine.cpp
View File

@@ -1092,9 +1092,7 @@ VehicleResolverObject::VehicleResolverObject(EngineID engine_type, const Vehicle
}
}
void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result)
static void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result)
{
VehicleResolverObject object(engine, v, VehicleResolverObject::WO_CACHED, false, CBID_NO_CALLBACK);
result->Clear();
@@ -1115,8 +1113,17 @@ void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction directio
}
}
void GetCustomVehicleSprite(const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result)
{
GetCustomEngineSprite(v->engine_type, v, direction, image_type, result);
}
void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result)
void GetCustomVehicleIcon(EngineID engine, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result)
{
GetCustomEngineSprite(engine, nullptr, direction, image_type, result);
}
static void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result)
{
const Engine *e = Engine::Get(engine);
@@ -1149,6 +1156,15 @@ void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineIma
}
}
void GetCustomRotorSprite(const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result)
{
GetRotorOverrideSprite(v->engine_type, v, image_type, result);
}
void GetCustomRotorIcon(EngineID engine, EngineImageType image_type, VehicleSpriteSeq *result)
{
GetRotorOverrideSprite(engine, nullptr, image_type, result);
}
/**
* Check if a wagon is currently using a wagon override