diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-01-07 14:53:01 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-01-07 14:53:01 +0200 |
| commit | ec509fac123432cec18a42da2f2cc214a78651a2 (patch) | |
| tree | b8d6f94c0ca39d3b18c7bbd467d8fe5d4cfc4f72 /src | |
| parent | d38ac3aae3340beffb44cdd78a8dfd52828ec503 (diff) | |
| download | minetest-ec509fac123432cec18a42da2f2cc214a78651a2.tar.gz minetest-ec509fac123432cec18a42da2f2cc214a78651a2.tar.bz2 minetest-ec509fac123432cec18a42da2f2cc214a78651a2.zip | |
removed Client::isFetchingBlocks
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.cpp | 19 | ||||
| -rw-r--r-- | src/client.h | 3 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/client.cpp b/src/client.cpp index b86fbf09e..103f20c3c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1232,25 +1232,6 @@ void Client::Send(u16 channelnum, SharedBuffer<u8> data, bool reliable) m_con.Send(PEER_ID_SERVER, channelnum, data, reliable); } -bool Client::isFetchingBlocks() -{ - JMutexAutoLock conlock(m_con_mutex); - con::Peer *peer = m_con.GetPeerNoEx(PEER_ID_SERVER); - // Not really fetching but can't fetch more. - if(peer == NULL) return true; - - con::Channel *channel = &(peer->channels[1]); - /* - NOTE: Channel 0 should always be used for fetching blocks, - and for nothing else. - */ - if(channel->incoming_reliables.size() > 0) - return true; - if(channel->outgoing_reliables.size() > 0) - return true; - return false; -} - IncomingPacket Client::getPacket() { JMutexAutoLock lock(m_incoming_queue_mutex); diff --git a/src/client.h b/src/client.h index c56b615cb..b96ddcbcf 100644 --- a/src/client.h +++ b/src/client.h @@ -145,9 +145,6 @@ public: bool AsyncProcessData(); void Send(u16 channelnum, SharedBuffer<u8> data, bool reliable); - //TODO: Remove - bool isFetchingBlocks(); - // Pops out a packet from the packet queue IncomingPacket getPacket(); |