miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.10.0-beta1

Browse Source
This commit is contained in:
dP
2019-10-31 22:24:28 +03:00
parent b84a475e14
commit 599ccf0c2b
1470 changed files with 354219 additions and 16795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/depot_cmd.cpp
View File

@@ -33,7 +33,7 @@ static bool IsUniqueDepotName(const char *name)
const Depot *d;
FOR_ALL_DEPOTS(d) {
if (d->name != NULL && strcmp(d->name, name) == 0) return false;
if (d->name != nullptr && strcmp(d->name, name) == 0) return false;
}
return true;
@@ -51,7 +51,7 @@ static bool IsUniqueDepotName(const char *name)
CommandCost CmdRenameDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
Depot *d = Depot::GetIfValid(p1);
if (d == NULL) return CMD_ERROR;
if (d == nullptr) return CMD_ERROR;
CommandCost ret = CheckTileOwnership(d->xy);
if (ret.Failed()) return ret;
@@ -67,7 +67,7 @@ CommandCost CmdRenameDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
free(d->name);
if (reset) {
d->name = NULL;
d->name = nullptr;
MakeDefaultName(d);
} else {
d->name = stredup(text);