Implement GItlab CI daily builds for windows platform (32 & 64) (#5923)

[dragonfireclient.git] / src / clientiface.cpp

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 7f476f0ea50fc0ae931a06050a81bdaa737e2c95..b79d36ea2f1922e4e3a3e2ec3ee7ff3cac65101e 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"
@@ -32,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "network/serveropcodes.h"
 #include "util/srp.h"
+#include "face_position_cache.h"
 
 const char *ClientInterface::statenames[] = {
        "Invalid",
@@ -590,9 +590,9 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
        }
 }
 
-u32 RemoteClient::uptime()
+u64 RemoteClient::uptime() const
 {
-       return porting::getTime(PRECISION_SECONDS) - m_connection_time;
+       return porting::getTimeS() - m_connection_time;
 }
 
 ClientInterface::ClientInterface(con::Connection* con)
@@ -611,7 +611,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;
@@ -624,7 +624,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);
@@ -682,7 +682,7 @@ void ClientInterface::send(u16 peer_id, u8 channelnum,
 void ClientInterface::sendToAll(NetworkPacket *pkt)
 {
        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) {
                RemoteClient *client = i->second;
 
@@ -697,7 +697,7 @@ void ClientInterface::sendToAll(NetworkPacket *pkt)
 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())
@@ -711,7 +711,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())
@@ -726,7 +726,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())
@@ -738,7 +738,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())
@@ -750,7 +750,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())
@@ -762,10 +762,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);
@@ -784,7 +782,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;
 
@@ -800,7 +798,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())
@@ -821,7 +819,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())
@@ -835,7 +833,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())