Fix water-glass and water-lava surfaces

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

diff --git a/src/client.cpp b/src/client.cpp
index 5ec53a524ef50b494890747b8d9ea6286cff0ca3..69c91bc30947d161bfc9cbcd7725cca52b203b29 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -246,7 +246,7 @@ void Client::connect(Address address)
 {
        DSTACK(__FUNCTION_NAME);
        //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-       m_con.setTimeoutMs(0);
+       m_con.SetTimeoutMs(0);
        m_con.Connect(address);
 }
 
@@ -563,8 +563,8 @@ void Client::step(float dtime)
                        counter = 0.0;
                        //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
                        // connectedAndInitialized() is true, peer exists.
-                       con::Peer *peer = m_con.GetPeer(PEER_ID_SERVER);
-                       infostream<<"Client: avg_rtt="<<peer->avg_rtt<<std::endl;
+                       float avg_rtt = m_con.GetPeerAvgRTT(PEER_ID_SERVER);
+                       infostream<<"Client: avg_rtt="<<avg_rtt<<std::endl;
                }
        }
 
@@ -665,14 +665,13 @@ void Client::ReceiveAll()
 void Client::Receive()
 {
        DSTACK(__FUNCTION_NAME);
-       u32 data_maxsize = 200000;
-       Buffer<u8> data(data_maxsize);
+       SharedBuffer<u8> data;
        u16 sender_peer_id;
        u32 datasize;
        {
                //TimeTaker t1("con mutex and receive", m_device);
                //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-               datasize = m_con.Receive(sender_peer_id, *data, data_maxsize);
+               datasize = m_con.Receive(sender_peer_id, data);
        }
        //TimeTaker t1("ProcessData", m_device);
        ProcessData(*data, datasize, sender_peer_id);
@@ -709,14 +708,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                return;
        }
 
-       con::Peer *peer;
-       {
-               //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-               // All data is coming from the server
-               // PeerNotFoundException is handled by caller.
-               peer = m_con.GetPeer(PEER_ID_SERVER);
-       }
-
        u8 ser_version = m_server_ser_ver;
 
        //infostream<<"Client received command="<<(int)command<<std::endl;
@@ -2168,9 +2159,10 @@ ClientEvent Client::getClientEvent()
 
 float Client::getRTT(void)
 {
-       con::Peer *peer = m_con.GetPeerNoEx(PEER_ID_SERVER);
-       if(!peer)
-               return 0.0;
-       return peer->avg_rtt;
+       try{
+               return m_con.GetPeerAvgRTT(PEER_ID_SERVER);
+       } catch(con::PeerNotFoundException &e){
+               return 1337;
+       }
 }