From 8f7785771b9e02b1a1daf7a252550d78ea93053d Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Sat, 17 Jun 2017 19:11:28 +0200 Subject: Cpp11 initializers 2 (#5999) * C++11 patchset 10: continue cleanup on constructors * Drop obsolete bool MainMenuData::enable_public (setting is called with cURL in server loop) * More classes cleanup * More classes cleanup + change NULL tests to boolean tests --- src/clientiface.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/clientiface.cpp') diff --git a/src/clientiface.cpp b/src/clientiface.cpp index b79d36ea2..a629ccee7 100644 --- a/src/clientiface.cpp +++ b/src/clientiface.cpp @@ -79,11 +79,11 @@ void RemoteClient::GetNextBlocks ( RemotePlayer *player = env->getPlayer(peer_id); // This can happen sometimes; clients and players are not in perfect sync. - if (player == NULL) + if (!player) return; PlayerSAO *sao = player->getPlayerSAO(); - if (sao == NULL) + if (!sao) return; // Won't send anything if already sending @@ -275,8 +275,7 @@ void RemoteClient::GetNextBlocks ( bool surely_not_found_on_disk = false; bool block_is_invalid = false; - if(block != NULL) - { + if (block) { // Reset usage timer, this block will be of use in the future. block->resetUsageTimer(); @@ -645,7 +644,7 @@ void ClientInterface::step(float dtime) void ClientInterface::UpdatePlayerList() { - if (m_env != NULL) { + if (m_env) { std::vector clients = getClientIDs(); m_clients_names.clear(); @@ -664,7 +663,7 @@ void ClientInterface::UpdatePlayerList() { MutexAutoLock clientslock(m_clients_mutex); RemoteClient* client = lockedGetClientNoEx(*i); - if(client != NULL) + if (client) client->PrintInfo(infostream); } -- cgit v1.2.3