Use single box for halo mesh

[minetest.git] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index 4a9398f7082c07b89f73242c7921cc8ba18592b2..a845277bdc19d997ab78e6ee1d70de97019588b1 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
 
@@ -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),
@@ -323,7 +321,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);
 
@@ -333,7 +331,7 @@ void Client::connect(Address address,
 
 void Client::step(float dtime)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        // Limit a bit
        if(dtime > 2.0)
@@ -824,7 +822,7 @@ void Client::initLocalMapSaving(const Address &address,
 
 void Client::ReceiveAll()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
        u32 start_ms = porting::getTimeMs();
        for(;;)
        {
@@ -850,7 +848,7 @@ void Client::ReceiveAll()
 
 void Client::Receive()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
        NetworkPacket pkt;
        m_con.Receive(&pkt);
        ProcessData(&pkt);
@@ -867,7 +865,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();
@@ -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);
@@ -1059,8 +1058,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;
@@ -1211,7 +1212,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;
@@ -1220,7 +1221,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;
@@ -1229,7 +1230,7 @@ void Client::sendBreath(u16 breath)
 
 void Client::sendRespawn()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOSERVER_RESPAWN, 0);
        Send(&pkt);
@@ -1237,7 +1238,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));
@@ -1505,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;
@@ -1598,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);
        }