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

8
src/tbtr_template_vehicle.h
View File

@@ -122,8 +122,8 @@ public:
TemplateVehicle(EngineID eid)
{
next = NULL;
previous = NULL;
next = nullptr;
previous = nullptr;
first = this;
engine_type = eid;
this->reuse_depot_vehicles = true;
@@ -157,7 +157,7 @@ public:
bool IsPrimaryVehicle() const { return this->IsFrontEngine(); }
inline bool IsFrontEngine() const { return HasBit(this->subtype, GVSF_FRONT); }
inline bool HasArticulatedPart() const { return this->Next() != NULL && this->Next()->IsArticulatedPart(); }
inline bool HasArticulatedPart() const { return this->Next() != nullptr && this->Next()->IsArticulatedPart(); }
inline bool IsArticulatedPart() const { return HasBit(this->subtype, GVSF_ARTICULATED_PART); }
inline bool IsMultiheaded() const { return HasBit(this->subtype, GVSF_MULTIHEADED); }
@@ -214,7 +214,7 @@ struct TemplateReplacement : TemplateReplacementPool::PoolItem<&_template_replac
return tv;
}
}
return NULL;
return nullptr;
}
};