Isolate irrlicht references and use a singleton (#6041)

[minetest.git] / src / clientiface.cpp

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 39223d3eb5e05ccb554a66888a3a20a022356937..a629ccee7b18df1424cc1ec6396bf73b14c73cc4 100644 (file)
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <sstream>
 
 #include "clientiface.h"
-#include "util/numeric.h"
 #include "remoteplayer.h"
 #include "settings.h"
 #include "mapblock.h"
@@ -30,7 +29,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "emerge.h"
 #include "content_sao.h"              // TODO this is used for cleanup of only
 #include "log.h"
+#include "network/serveropcodes.h"
 #include "util/srp.h"
+#include "face_position_cache.h"
 
 const char *ClientInterface::statenames[] = {
        "Invalid",
@@ -78,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
@@ -274,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();
 
@@ -589,9 +589,9 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
        }
 }
 
-u32 RemoteClient::uptime()
+u64 RemoteClient::uptime() const
 {
-       return getTime(PRECISION_SECONDS) - m_connection_time;
+       return porting::getTimeS() - m_connection_time;
 }
 
 ClientInterface::ClientInterface(con::Connection* con)
@@ -610,7 +610,7 @@ ClientInterface::~ClientInterface()
        {
                MutexAutoLock clientslock(m_clients_mutex);
 
-               for (UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
+               for (RemoteClientMap::iterator i = m_clients.begin();
                        i != m_clients.end(); ++i) {
                        // Delete client
                        delete i->second;
@@ -623,7 +623,7 @@ std::vector<u16> ClientInterface::getClientIDs(ClientState min_state)
        std::vector<u16> reply;
        MutexAutoLock clientslock(m_clients_mutex);
 
-       for(UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
+       for (RemoteClientMap::iterator i = m_clients.begin();
                i != m_clients.end(); ++i) {
                if (i->second->getState() >= min_state)
                        reply.push_back(i->second->peer_id);
@@ -644,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();
 
@@ -663,7 +663,7 @@ void ClientInterface::UpdatePlayerList()
                        {
                                MutexAutoLock clientslock(m_clients_mutex);
                                RemoteClient* client = lockedGetClientNoEx(*i);
-                               if(client != NULL)
+                               if (client)
                                        client->PrintInfo(infostream);
                        }
 
@@ -678,16 +678,17 @@ void ClientInterface::send(u16 peer_id, u8 channelnum,
        m_con->Send(peer_id, channelnum, pkt, reliable);
 }
 
-void ClientInterface::sendToAll(u16 channelnum,
-               NetworkPacket* pkt, bool reliable)
+void ClientInterface::sendToAll(NetworkPacket *pkt)
 {
        MutexAutoLock clientslock(m_clients_mutex);
-       for(UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
-               i != m_clients.end(); ++i) {
+       for (RemoteClientMap::iterator i = m_clients.begin();
+                       i != m_clients.end(); ++i) {
                RemoteClient *client = i->second;
 
                if (client->net_proto_version != 0) {
-                       m_con->Send(client->peer_id, channelnum, pkt, reliable);
+                       m_con->Send(client->peer_id,
+                                       clientCommandFactoryTable[pkt->getCommand()].channel, pkt,
+                                       clientCommandFactoryTable[pkt->getCommand()].reliable);
                }
        }
 }
@@ -695,7 +696,7 @@ void ClientInterface::sendToAll(u16 channelnum,
 RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min)
 {
        MutexAutoLock clientslock(m_clients_mutex);
-       UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
+       RemoteClientMap::const_iterator n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
        // access is denied, and this event occurs later then.
        if (n == m_clients.end())
@@ -709,7 +710,7 @@ RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min)
 
 RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState state_min)
 {
-       UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
+       RemoteClientMap::const_iterator n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
        // access is denied, and this event occurs later then.
        if (n == m_clients.end())
@@ -724,7 +725,7 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState stat
 ClientState ClientInterface::getClientState(u16 peer_id)
 {
        MutexAutoLock clientslock(m_clients_mutex);
-       UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
+       RemoteClientMap::const_iterator n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
        // access is denied, and this event occurs later then.
        if (n == m_clients.end())
@@ -736,7 +737,7 @@ ClientState ClientInterface::getClientState(u16 peer_id)
 void ClientInterface::setPlayerName(u16 peer_id,std::string name)
 {
        MutexAutoLock clientslock(m_clients_mutex);
-       UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
+       RemoteClientMap::iterator n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
        // access is denied, and this event occurs later then.
        if (n != m_clients.end())
@@ -748,7 +749,7 @@ void ClientInterface::DeleteClient(u16 peer_id)
        MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
-       UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
+       RemoteClientMap::iterator n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
        // access is denied, and this event occurs later then.
        if (n == m_clients.end())
@@ -760,10 +761,8 @@ void ClientInterface::DeleteClient(u16 peer_id)
        //TODO this should be done by client destructor!!!
        RemoteClient *client = n->second;
        // Handle objects
-       for(std::set<u16>::iterator
-                       i = client->m_known_objects.begin();
-                       i != client->m_known_objects.end(); ++i)
-       {
+       for (std::set<u16>::iterator i = client->m_known_objects.begin();
+                       i != client->m_known_objects.end(); ++i) {
                // Get object
                u16 id = *i;
                ServerActiveObject* obj = m_env->getActiveObject(id);
@@ -782,7 +781,7 @@ void ClientInterface::CreateClient(u16 peer_id)
        MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
-       UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
+       RemoteClientMap::iterator n = m_clients.find(peer_id);
        // The client shouldn't already exist
        if (n != m_clients.end()) return;
 
@@ -798,7 +797,7 @@ void ClientInterface::event(u16 peer_id, ClientStateEvent event)
                MutexAutoLock clientlock(m_clients_mutex);
 
                // Error check
-               UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
+               RemoteClientMap::iterator n = m_clients.find(peer_id);
 
                // No client to deliver event
                if (n == m_clients.end())
@@ -819,7 +818,7 @@ u16 ClientInterface::getProtocolVersion(u16 peer_id)
        MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
-       UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
+       RemoteClientMap::iterator n = m_clients.find(peer_id);
 
        // No client to get version
        if (n == m_clients.end())
@@ -833,7 +832,7 @@ void ClientInterface::setClientVersion(u16 peer_id, u8 major, u8 minor, u8 patch
        MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
-       UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
+       RemoteClientMap::iterator n = m_clients.find(peer_id);
 
        // No client to set versions
        if (n == m_clients.end())