FormSpec: Add StaticTextSpec and superimpose over item image buttons

[minetest.git] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index 5c04632d1ecbe09d8d2c35d7bc3163db63044ec2..a845277bdc19d997ab78e6ee1d70de97019588b1 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -235,11 +235,9 @@ Client::Client(
        m_inventory_updated(false),
        m_inventory_from_server(NULL),
        m_inventory_from_server_age(0.0),
-       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_chosen_auth_mech(AUTH_MECHANISM_NONE),
@@ -946,6 +944,7 @@ void Client::interact(u8 action, const PointedThing& pointed)
                2: digging completed
                3: place block or item (to abovesurface)
                4: use item
+               5: perform secondary action of item
        */
 
        NetworkPacket pkt(TOSERVER_INTERACT, 1 + 2 + 0);
@@ -1507,15 +1506,6 @@ int Client::getCrackLevel()
        return m_crack_level;
 }
 
-void Client::setHighlighted(v3s16 pos, bool show_highlighted)
-{
-       m_show_highlighted = show_highlighted;
-       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;
@@ -1600,7 +1590,6 @@ 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_highlighted);
                data->setSmoothLighting(m_cache_smooth_lighting);
        }