Modernize client code (#6250)

[oweals/minetest.git] / src / clientiface.cpp

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index b79d36ea2f1922e4e3a3e2ec3ee7ff3cac65101e..fdabcc7839fadc56813a770943fa738e883ccf3c 100644 (file)
--- 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
@@ -95,7 +95,7 @@ void RemoteClient::GetNextBlocks (
        }
 
        v3f playerpos = sao->getBasePosition();
-       v3f playerspeed = player->getSpeed();
+       const v3f &playerspeed = player->getSpeed();
        v3f playerspeeddir(0,0,0);
        if(playerspeed.getLength() > 1.0*BS)
                playerspeeddir = playerspeed / playerspeed.getLength();
@@ -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<u16> 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);
                        }
 
@@ -694,6 +693,32 @@ void ClientInterface::sendToAll(NetworkPacket *pkt)
        }
 }
 
+void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacypkt,
+               u16 min_proto_ver)
+{
+       MutexAutoLock clientslock(m_clients_mutex);
+       for (std::unordered_map<u16, RemoteClient*>::iterator i = m_clients.begin();
+                       i != m_clients.end(); ++i) {
+               RemoteClient *client = i->second;
+               NetworkPacket *pkt_to_send = nullptr;
+
+               if (client->net_proto_version >= min_proto_ver) {
+                       pkt_to_send = pkt;
+               } else if (client->net_proto_version != 0) {
+                       pkt_to_send = legacypkt;
+               } else {
+                       warningstream << "Client with unhandled version to handle: '"
+                               << client->net_proto_version << "'";
+                       continue;
+               }
+
+               m_con->Send(client->peer_id,
+                       clientCommandFactoryTable[pkt_to_send->getCommand()].channel,
+                       pkt_to_send,
+                       clientCommandFactoryTable[pkt_to_send->getCommand()].reliable);
+       }
+}
+
 RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min)
 {
        MutexAutoLock clientslock(m_clients_mutex);