summaryrefslogtreecommitdiff
path: root/src/script/api/script_client.cpp
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2019-04-10 22:07:06 +0100
committerMichael Lutz <michi@icosahedron.de>2019-04-10 23:22:20 +0200
commit7c8e7c6b6e16d4a26259a676db32d8776b99817e (patch)
tree99f134b7e66367cf11e10bc5061896eab4a3264f /src/script/api/script_client.cpp
parent3b4f224c0bc50e7248050d4bcbb6d83fd510c1cc (diff)
downloadopenttd-7c8e7c6b6e16d4a26259a676db32d8776b99817e.tar.xz
Codechange: Use null pointer literal instead of the NULL macro
Diffstat (limited to 'src/script/api/script_client.cpp')
-rw-r--r--src/script/api/script_client.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/script/api/script_client.cpp b/src/script/api/script_client.cpp
index 855ad86a0..247cac98c 100644
--- a/src/script/api/script_client.cpp
+++ b/src/script/api/script_client.cpp
@@ -20,37 +20,37 @@
* Finds NetworkClientInfo given client-identifier,
* is used by other methods to resolve client-identifier.
* @param client The client to get info structure for
- * @return A pointer to corresponding CI struct or NULL when not found.
+ * @return A pointer to corresponding CI struct or nullptr when not found.
*/
static NetworkClientInfo *FindClientInfo(ScriptClient::ClientID client)
{
- if (client == ScriptClient::CLIENT_INVALID) return NULL;
- if (!_networking) return NULL;
+ if (client == ScriptClient::CLIENT_INVALID) return nullptr;
+ if (!_networking) return nullptr;
return NetworkClientInfo::GetByClientID((::ClientID)client);
}
/* static */ ScriptClient::ClientID ScriptClient::ResolveClientID(ScriptClient::ClientID client)
{
- return (FindClientInfo(client) == NULL ? ScriptClient::CLIENT_INVALID : client);
+ return (FindClientInfo(client) == nullptr ? ScriptClient::CLIENT_INVALID : client);
}
/* static */ char *ScriptClient::GetName(ScriptClient::ClientID client)
{
NetworkClientInfo *ci = FindClientInfo(client);
- if (ci == NULL) return NULL;
+ if (ci == nullptr) return nullptr;
return stredup(ci->client_name);
}
/* static */ ScriptCompany::CompanyID ScriptClient::GetCompany(ScriptClient::ClientID client)
{
NetworkClientInfo *ci = FindClientInfo(client);
- if (ci == NULL) return ScriptCompany::COMPANY_INVALID;
+ if (ci == nullptr) return ScriptCompany::COMPANY_INVALID;
return (ScriptCompany::CompanyID)ci->client_playas;
}
/* static */ ScriptDate::Date ScriptClient::GetJoinDate(ScriptClient::ClientID client)
{
NetworkClientInfo *ci = FindClientInfo(client);
- if (ci == NULL) return ScriptDate::DATE_INVALID;
+ if (ci == nullptr) return ScriptDate::DATE_INVALID;
return (ScriptDate::Date)ci->join_date;
}