ServerRemotePlayer implements ServerActiveObject

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

diff --git a/src/client.h b/src/client.h
index 07ac930c912b714d0f590ce03cbb256be8bdb434..8585f6d4a6a7c8514a4bc0a1df2de175785b3a38 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -251,11 +251,11 @@ public:
 
        float getAvgRtt()
        {
-               //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-               con::Peer *peer = m_con.GetPeerNoEx(PEER_ID_SERVER);
-               if(peer == NULL)
-                       return 0.0;
-               return peer->avg_rtt;
+               try{
+                       return m_con.GetPeerAvgRTT(PEER_ID_SERVER);
+               } catch(con::PeerNotFoundException){
+                       return 1337;
+               }
        }
 
        bool getChatMessage(std::wstring &message)
@@ -301,6 +301,8 @@ public:
                return m_access_denied_reason;
        }
 
+       float getRTT(void);
+
 private:
        
        // Virtual methods from con::PeerHandler