dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge: Codechange: Use null pointer literal instead of the NULL macro

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-04-11 18:14:13 +01:00
parent f5747bf753 7c8e7c6b6e
commit 674732cd68
585 changed files with 6604 additions and 6604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tbtr_template_vehicle.cpp
View File

@@ -58,7 +58,7 @@ void TemplateVehicleImageDimensions::SetFromTrain(const Train *t)
this->cached_veh_length = t->gcache.cached_veh_length;
const Engine *e = t->GetEngine();
if (e->GetGRF() != NULL && is_custom_sprite(e->u.rail.image_index)) {
if (e->GetGRF() != nullptr && is_custom_sprite(e->u.rail.image_index)) {
this->reference_width = e->GetGRF()->traininfo_vehicle_width;
this->vehicle_pitch = e->GetGRF()->traininfo_vehicle_pitch;
}
@@ -85,7 +85,7 @@ TemplateVehicle::TemplateVehicle(VehicleType ty, EngineID eid, byte subtypeflag,
TemplateVehicle::~TemplateVehicle() {
TemplateVehicle *v = this->Next();
this->SetNext(NULL);
this->SetNext(nullptr);
delete v;
}
@@ -137,7 +137,7 @@ TemplateReplacement* GetTemplateReplacementByGroupID(GroupID gid)
return tr;
}
}
return NULL;
return nullptr;
}
bool IssueTemplateReplacement(GroupID gid, TemplateID tid)