Use configured bind_address for HTTPFetch

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

diff --git a/src/client.cpp b/src/client.cpp
index 8b89dd63cae8b52943445e7a5b04be076a0d4ed4..30280369f81f539c56ae5a56f5b858da0d093819 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -47,7 +47,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 #include "util/serialize.h"
 #include "config.h"
-#include "cmake_config_githash.h"
 #include "util/directiontables.h"
 #include "util/pointedthing.h"
 #include "version.h"
@@ -2197,8 +2196,8 @@ void Client::sendReady()
        writeU8(os,VERSION_PATCH_ORIG);
        writeU8(os,0);
 
-       writeU16(os,strlen(CMAKE_VERSION_GITHASH));
-       os.write(CMAKE_VERSION_GITHASH,strlen(CMAKE_VERSION_GITHASH));
+       writeU16(os,strlen(minetest_version_hash));
+       os.write(minetest_version_hash,strlen(minetest_version_hash));
 
        // Make data buffer
        std::string s = os.str();
@@ -2476,6 +2475,15 @@ int Client::getCrackLevel()
        return m_crack_level;
 }
 
+void Client::setHighlighted(v3s16 pos, bool show_hud)
+{
+       m_show_hud = show_hud;
+       v3s16 old_highlighted_pos = m_highlighted_pos;
+       m_highlighted_pos = pos;
+       addUpdateMeshTaskForNode(old_highlighted_pos, false, true);
+       addUpdateMeshTaskForNode(m_highlighted_pos, false, true);
+}
+
 void Client::setCrack(int level, v3s16 pos)
 {
        int old_crack_level = m_crack_level;
@@ -2548,22 +2556,23 @@ void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
        MapBlock *b = m_env.getMap().getBlockNoCreateNoEx(p);
        if(b == NULL)
                return;
-       
+
        /*
                Create a task to update the mesh of the block
        */
-       
+
        MeshMakeData *data = new MeshMakeData(this);
-       
+
        {
                //TimeTaker timer("data fill");
                // Release: ~0ms
                // Debug: 1-6ms, avg=2ms
                data->fill(b);
                data->setCrack(m_crack_level, m_crack_pos);
+               data->setHighlighted(m_highlighted_pos, m_show_hud);
                data->setSmoothLighting(g_settings->getBool("smooth_lighting"));
        }
-       
+
        // Add task to queue
        m_mesh_update_thread.m_queue_in.addBlock(p, data, ack_to_server, urgent);
 }