Rename macros with two leading underscores

[minetest.git] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index dda0f5191c39f1d06a317fa2dd3af4a07dd4f288..5c04632d1ecbe09d8d2c35d7bc3163db63044ec2 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -98,7 +98,7 @@ 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
 
@@ -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),
@@ -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)
@@ -823,7 +824,7 @@ void Client::initLocalMapSaving(const Address &address,
 
 void Client::ReceiveAll()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
        u32 start_ms = porting::getTimeMs();
        for(;;)
        {
@@ -849,7 +850,7 @@ void Client::ReceiveAll()
 
 void Client::Receive()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
        NetworkPacket pkt;
        m_con.Receive(&pkt);
        ProcessData(&pkt);
@@ -866,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();
@@ -1058,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;
@@ -1210,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;
@@ -1219,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;
@@ -1228,7 +1231,7 @@ void Client::sendBreath(u16 breath)
 
 void Client::sendRespawn()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOSERVER_RESPAWN, 0);
        Send(&pkt);
@@ -1236,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));