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

Codechange: Use null pointer literal instead of the NULL macro

Browse Source
This commit is contained in:
Henry Wilson
2019-04-10 22:07:06 +01:00
committed by Michael Lutz
parent 3b4f224c0b
commit 7c8e7c6b6e
463 changed files with 5674 additions and 5674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/newgrf_townname.cpp
View File

@@ -21,21 +21,21 @@
#include "safeguards.h"
static GRFTownName *_grf_townnames = NULL;
static GRFTownName *_grf_townnames = nullptr;
GRFTownName *GetGRFTownName(uint32 grfid)
{
GRFTownName *t = _grf_townnames;
for (; t != NULL; t = t->next) {
for (; t != nullptr; t = t->next) {
if (t->grfid == grfid) return t;
}
return NULL;
return nullptr;
}
GRFTownName *AddGRFTownName(uint32 grfid)
{
GRFTownName *t = GetGRFTownName(grfid);
if (t == NULL) {
if (t == nullptr) {
t = CallocT<GRFTownName>(1);
t->grfid = grfid;
t->next = _grf_townnames;
@@ -47,9 +47,9 @@ GRFTownName *AddGRFTownName(uint32 grfid)
void DelGRFTownName(uint32 grfid)
{
GRFTownName *t = _grf_townnames;
GRFTownName *p = NULL;
for (;t != NULL; p = t, t = t->next) if (t->grfid == grfid) break;
if (t != NULL) {
GRFTownName *p = nullptr;
for (;t != nullptr; p = t, t = t->next) if (t->grfid == grfid) break;
if (t != nullptr) {
for (int i = 0; i < 128; i++) {
for (int j = 0; j < t->nbparts[i]; j++) {
for (int k = 0; k < t->partlist[i][j].partcount; k++) {
@@ -59,7 +59,7 @@ void DelGRFTownName(uint32 grfid)
}
free(t->partlist[i]);
}
if (p != NULL) {
if (p != nullptr) {
p->next = t->next;
} else {
_grf_townnames = t->next;
@@ -70,7 +70,7 @@ void DelGRFTownName(uint32 grfid)
static char *RandomPart(char *buf, GRFTownName *t, uint32 seed, byte id, const char *last)
{
assert(t != NULL);
assert(t != nullptr);
for (int i = 0; i < t->nbparts[id]; i++) {
byte count = t->partlist[id][i].bitcount;
uint16 maxprob = t->partlist[id][i].maxprob;
@@ -93,7 +93,7 @@ static char *RandomPart(char *buf, GRFTownName *t, uint32 seed, byte id, const c
char *GRFTownNameGenerate(char *buf, uint32 grfid, uint16 gen, uint32 seed, const char *last)
{
strecpy(buf, "", last);
for (GRFTownName *t = _grf_townnames; t != NULL; t = t->next) {
for (GRFTownName *t = _grf_townnames; t != nullptr; t = t->next) {
if (t->grfid == grfid) {
assert(gen < t->nb_gen);
buf = RandomPart(buf, t, seed, t->id[gen], last);
@@ -106,9 +106,9 @@ char *GRFTownNameGenerate(char *buf, uint32 grfid, uint16 gen, uint32 seed, cons
StringID *GetGRFTownNameList()
{
int nb_names = 0, n = 0;
for (GRFTownName *t = _grf_townnames; t != NULL; t = t->next) nb_names += t->nb_gen;
for (GRFTownName *t = _grf_townnames; t != nullptr; t = t->next) nb_names += t->nb_gen;
StringID *list = MallocT<StringID>(nb_names + 1);
for (GRFTownName *t = _grf_townnames; t != NULL; t = t->next) {
for (GRFTownName *t = _grf_townnames; t != nullptr; t = t->next) {
for (int j = 0; j < t->nb_gen; j++) list[n++] = t->name[j];
}
list[n] = INVALID_STRING_ID;
@@ -117,12 +117,12 @@ StringID *GetGRFTownNameList()
void CleanUpGRFTownNames()
{
while (_grf_townnames != NULL) DelGRFTownName(_grf_townnames->grfid);
while (_grf_townnames != nullptr) DelGRFTownName(_grf_townnames->grfid);
}
uint32 GetGRFTownNameId(int gen)
{
for (GRFTownName *t = _grf_townnames; t != NULL; t = t->next) {
for (GRFTownName *t = _grf_townnames; t != nullptr; t = t->next) {
if (gen < t->nb_gen) return t->grfid;
gen -= t->nb_gen;
}
@@ -132,7 +132,7 @@ uint32 GetGRFTownNameId(int gen)
uint16 GetGRFTownNameType(int gen)
{
for (GRFTownName *t = _grf_townnames; t != NULL; t = t->next) {
for (GRFTownName *t = _grf_townnames; t != nullptr; t = t->next) {
if (gen < t->nb_gen) return gen;
gen -= t->nb_gen;
}