Rename macros with two leading underscores

[minetest.git] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index d4d3b6df64b36d8dd49aa2fbcfa9db6cc2a2beef..5c04632d1ecbe09d8d2c35d7bc3163db63044ec2 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <algorithm>
 #include <sstream>
 #include <IFileSystem.h>
-#include "jthread/jmutexautolock.h"
+#include "threading/mutex_auto_lock.h"
 #include "util/auth.h"
 #include "util/directiontables.h"
 #include "util/pointedthing.h"
@@ -82,11 +82,11 @@ MeshUpdateQueue::MeshUpdateQueue()
 
 MeshUpdateQueue::~MeshUpdateQueue()
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        for(std::vector<QueuedMeshUpdate*>::iterator
                        i = m_queue.begin();
-                       i != m_queue.end(); i++)
+                       i != m_queue.end(); ++i)
        {
                QueuedMeshUpdate *q = *i;
                delete q;
@@ -98,11 +98,11 @@ MeshUpdateQueue::~MeshUpdateQueue()
 */
 void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        assert(data);   // pre-condition
 
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        if(urgent)
                m_urgents.insert(p);
@@ -113,7 +113,7 @@ void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_se
        */
        for(std::vector<QueuedMeshUpdate*>::iterator
                        i = m_queue.begin();
-                       i != m_queue.end(); i++)
+                       i != m_queue.end(); ++i)
        {
                QueuedMeshUpdate *q = *i;
                if(q->p == p)
@@ -141,12 +141,12 @@ void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_se
 // Returns NULL if queue is empty
 QueuedMeshUpdate *MeshUpdateQueue::pop()
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        bool must_be_urgent = !m_urgents.empty();
        for(std::vector<QueuedMeshUpdate*>::iterator
                        i = m_queue.begin();
-                       i != m_queue.end(); i++)
+                       i != m_queue.end(); ++i)
        {
                QueuedMeshUpdate *q = *i;
                if(must_be_urgent && m_urgents.count(q->p) == 0)
@@ -228,6 +228,7 @@ Client::Client(
        m_particle_manager(&m_env),
        m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
        m_device(device),
+       m_minimap_disabled_by_server(false),
        m_server_ser_ver(SER_FMT_VER_INVALID),
        m_proto_ver(0),
        m_playeritem(0),
@@ -269,7 +270,7 @@ Client::Client(
 void Client::Stop()
 {
        //request all client managed threads to stop
-       m_mesh_update_thread.Stop();
+       m_mesh_update_thread.stop();
        // Save local server map
        if (m_localdb) {
                infostream << "Local map saving ended." << std::endl;
@@ -280,7 +281,7 @@ void Client::Stop()
 bool Client::isShutdown()
 {
 
-       if (!m_mesh_update_thread.IsRunning()) return true;
+       if (!m_mesh_update_thread.isRunning()) return true;
 
        return false;
 }
@@ -289,8 +290,8 @@ Client::~Client()
 {
        m_con.Disconnect();
 
-       m_mesh_update_thread.Stop();
-       m_mesh_update_thread.Wait();
+       m_mesh_update_thread.stop();
+       m_mesh_update_thread.wait();
        while (!m_mesh_update_thread.m_queue_out.empty()) {
                MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx();
                delete r.mesh;
@@ -322,7 +323,7 @@ void Client::connect(Address address,
                const std::string &address_name,
                bool is_local_server)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        initLocalMapSaving(address, address_name, is_local_server);
 
@@ -332,7 +333,7 @@ void Client::connect(Address address,
 
 void Client::step(float dtime)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        // Limit a bit
        if(dtime > 2.0)
@@ -421,8 +422,9 @@ void Client::step(float dtime)
                ScopeProfiler sp(g_profiler, "Client: map timer and unload");
                std::vector<v3s16> deleted_blocks;
                m_env.getMap().timerUpdate(map_timer_and_unload_dtime,
-                               g_settings->getFloat("client_unload_unused_data_timeout"),
-                               &deleted_blocks);
+                       g_settings->getFloat("client_unload_unused_data_timeout"),
+                       g_settings->getS32("client_mapblock_limit"),
+                       &deleted_blocks);
 
                /*
                        Send info to server
@@ -616,7 +618,7 @@ void Client::step(float dtime)
        {
                for(std::map<int, u16>::iterator
                                i = m_sounds_to_objects.begin();
-                               i != m_sounds_to_objects.end(); i++)
+                               i != m_sounds_to_objects.end(); ++i)
                {
                        int client_id = i->first;
                        u16 object_id = i->second;
@@ -641,7 +643,7 @@ void Client::step(float dtime)
                                i != m_sounds_server_to_client.end();) {
                        s32 server_id = i->first;
                        int client_id = i->second;
-                       i++;
+                       ++i;
                        if(!m_sound->soundExists(client_id)) {
                                m_sounds_server_to_client.erase(server_id);
                                m_sounds_client_to_server.erase(client_id);
@@ -822,7 +824,7 @@ void Client::initLocalMapSaving(const Address &address,
 
 void Client::ReceiveAll()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
        u32 start_ms = porting::getTimeMs();
        for(;;)
        {
@@ -848,7 +850,7 @@ void Client::ReceiveAll()
 
 void Client::Receive()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
        NetworkPacket pkt;
        m_con.Receive(&pkt);
        ProcessData(&pkt);
@@ -865,7 +867,7 @@ inline void Client::handleCommand(NetworkPacket* pkt)
 */
 void Client::ProcessData(NetworkPacket *pkt)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        ToClientCommand command = (ToClientCommand) pkt->getCommand();
        u32 sender_peer_id = pkt->getPeerId();
@@ -1057,8 +1059,10 @@ void Client::startAuth(AuthMechanism chosen_auth_mechanism)
                                m_password.length(), NULL, NULL);
                        char *bytes_A = 0;
                        size_t len_A = 0;
-                       srp_user_start_authentication((struct SRPUser *) m_auth_data,
-                               NULL, NULL, 0, (unsigned char **) &bytes_A, &len_A);
+                       SRP_Result res = srp_user_start_authentication(
+                               (struct SRPUser *) m_auth_data, NULL, NULL, 0,
+                               (unsigned char **) &bytes_A, &len_A);
+                       FATAL_ERROR_IF(res != SRP_OK, "Creating local SRP user failed.");
 
                        NetworkPacket resp_pkt(TOSERVER_SRP_BYTES_A, 0);
                        resp_pkt << std::string(bytes_A, len_A) << based_on;
@@ -1104,7 +1108,7 @@ void Client::sendRemovedSounds(std::vector<s32> &soundList)
        pkt << (u16) (server_ids & 0xFFFF);
 
        for(std::vector<s32>::iterator i = soundList.begin();
-                       i != soundList.end(); i++)
+                       i != soundList.end(); ++i)
                pkt << *i;
 
        Send(&pkt);
@@ -1209,7 +1213,7 @@ void Client::sendChangePassword(const std::string &oldpassword,
 
 void Client::sendDamage(u8 damage)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOSERVER_DAMAGE, sizeof(u8));
        pkt << damage;
@@ -1218,7 +1222,7 @@ void Client::sendDamage(u8 damage)
 
 void Client::sendBreath(u16 breath)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOSERVER_BREATH, sizeof(u16));
        pkt << breath;
@@ -1227,7 +1231,7 @@ void Client::sendBreath(u16 breath)
 
 void Client::sendRespawn()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOSERVER_RESPAWN, 0);
        Send(&pkt);
@@ -1235,7 +1239,7 @@ void Client::sendRespawn()
 
 void Client::sendReady()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOSERVER_CLIENT_READY,
                        1 + 1 + 1 + 1 + 2 + sizeof(char) * strlen(g_version_hash));
@@ -1269,7 +1273,7 @@ void Client::sendPlayerPos()
 
        u16 our_peer_id;
        {
-               //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
+               //MutexAutoLock lock(m_con_mutex); //bulk comment-out
                our_peer_id = m_con.GetPeerID();
        }
 
@@ -1793,7 +1797,7 @@ void Client::afterContentReceived(IrrlichtDevice *device)
 
        // Start mesh update thread after setting up content definitions
        infostream<<"- Starting mesh update thread"<<std::endl;
-       m_mesh_update_thread.Start();
+       m_mesh_update_thread.start();
 
        m_state = LC_Ready;
        sendReady();