diff options
| author | Henry Wilson <m3henry@googlemail.com> | 2019-04-10 22:07:06 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2019-04-10 23:22:20 +0200 |
| commit | 7c8e7c6b6e16d4a26259a676db32d8776b99817e (patch) | |
| tree | 99f134b7e66367cf11e10bc5061896eab4a3264f /src/newgrf_engine.h | |
| parent | 3b4f224c0bc50e7248050d4bcbb6d83fd510c1cc (diff) | |
| download | openttd-7c8e7c6b6e16d4a26259a676db32d8776b99817e.tar.xz | |
Codechange: Use null pointer literal instead of the NULL macro
Diffstat (limited to 'src/newgrf_engine.h')
| -rw-r--r-- | src/newgrf_engine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/newgrf_engine.h b/src/newgrf_engine.h index 644ff5f01..a3ead85ca 100644 --- a/src/newgrf_engine.h +++ b/src/newgrf_engine.h @@ -81,11 +81,11 @@ void SetCustomEngineSprites(EngineID engine, byte cargo, const struct SpriteGrou void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result); #define GetCustomVehicleSprite(v, direction, image_type, result) GetCustomEngineSprite(v->engine_type, v, direction, image_type, result) -#define GetCustomVehicleIcon(et, direction, image_type, result) GetCustomEngineSprite(et, NULL, direction, image_type, result) +#define GetCustomVehicleIcon(et, direction, image_type, result) GetCustomEngineSprite(et, nullptr, direction, image_type, result) void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, bool info_view, EngineImageType image_type, VehicleSpriteSeq *result); #define GetCustomRotorSprite(v, i, image_type, result) GetRotorOverrideSprite(v->engine_type, v, i, image_type, result) -#define GetCustomRotorIcon(et, image_type, result) GetRotorOverrideSprite(et, NULL, true, image_type, result) +#define GetCustomRotorIcon(et, image_type, result) GetRotorOverrideSprite(et, nullptr, true, image_type, result) /* Forward declaration of GRFFile, to avoid unnecessary inclusion of newgrf.h * elsewhere... */ @@ -100,7 +100,7 @@ bool UsesWagonOverride(const Vehicle *v); /* Handler to Evaluate callback 36. If the callback fails (i.e. most of the * time) orig_value is returned */ uint GetVehicleProperty(const Vehicle *v, PropertyID property, uint orig_value); -uint GetEngineProperty(EngineID engine, PropertyID property, uint orig_value, const Vehicle *v = NULL); +uint GetEngineProperty(EngineID engine, PropertyID property, uint orig_value, const Vehicle *v = nullptr); enum VehicleTrigger { VEHICLE_TRIGGER_NEW_CARGO = 0x01, |