Fix node 0,0,0 being highlighted when enable_node_highlighting == false

Without this patch node 0,0,0 is highlighted when enable_node_highligting is false
There is a minor lighting issue remaining, however it seems to be related to a different bug (https://github.com/minetest/minetest/issues/1887)

diff --git a/src/client.cpp b/src/client.cpp
index e9172e6fcaefa0d221857d1d4cdbdc09e6e236cd..c7fea6a114d441f1a0fa29288c5937300b067eec 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -255,10 +255,11 @@ Client::Client(
        m_inventory_updated(false),
        m_inventory_from_server(NULL),
        m_inventory_from_server_age(0.0),
-       m_show_hud(true),
+       m_show_highlighted(false),
        m_animation_time(0),
        m_crack_level(-1),
        m_crack_pos(0,0,0),
+       m_highlighted_pos(0,0,0),
        m_map_seed(0),
        m_password(password),
        m_access_denied(false),
@@ -2515,9 +2516,9 @@ int Client::getCrackLevel()
        return m_crack_level;
 }
 
-void Client::setHighlighted(v3s16 pos, bool show_hud)
+void Client::setHighlighted(v3s16 pos, bool show_highlighted)
 {
-       m_show_hud = show_hud;
+       m_show_highlighted = show_highlighted;
        v3s16 old_highlighted_pos = m_highlighted_pos;
        m_highlighted_pos = pos;
        addUpdateMeshTaskForNode(old_highlighted_pos, false, true);
@@ -2607,7 +2608,7 @@ void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
                // 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->setHighlighted(m_highlighted_pos, m_show_highlighted);
                data->setSmoothLighting(g_settings->getBool("smooth_lighting"));
        }
 

diff --git a/src/client.h b/src/client.h
index e871dee93d58fd5adae9f17d7cebd45fd5a4cf77..b91f12b53030df2647d27bf5d219ed7fec6c8565 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -398,7 +398,7 @@ public:
        int getCrackLevel();
        void setCrack(int level, v3s16 pos);
 
-       void setHighlighted(v3s16 pos, bool show_hud);
+       void setHighlighted(v3s16 pos, bool show_higlighted);
        v3s16 getHighlighted(){ return m_highlighted_pos; }
 
        u16 getHP();
@@ -509,7 +509,7 @@ private:
        float m_inventory_from_server_age;
        std::set<v3s16> m_active_blocks;
        PacketCounter m_packetcounter;
-       bool m_show_hud;
+       bool m_show_highlighted;
        // Block mesh animation parameters
        float m_animation_time;
        int m_crack_level;

diff --git a/src/game.cpp b/src/game.cpp
index b6f96acc371b7f4df8c252c2dc307478e3e0a412..aa12e6c3f479b41ba07a57120ed7ea3ee99ab37b 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2697,7 +2697,8 @@ void Game::toggleHud(float *statustext_time, bool *flag)
        *flag = !*flag;
        *statustext_time = 0;
        statustext = msg[*flag];
-       client->setHighlighted(client->getHighlighted(), *flag);
+       if (g_settings->getBool("enable_node_highlighting"))
+               client->setHighlighted(client->getHighlighted(), *flag);
 }