From ec509fac123432cec18a42da2f2cc214a78651a2 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 7 Jan 2011 14:53:01 +0200 Subject: [PATCH] removed Client::isFetchingBlocks --- src/client.cpp | 19 ------------------- src/client.h | 3 --- 2 files changed, 22 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index b86fbf0..103f20c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1232,25 +1232,6 @@ void Client::Send(u16 channelnum, SharedBuffer 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 c56b615..b96ddcb 100644 --- a/src/client.h +++ b/src/client.h @@ -145,9 +145,6 @@ public: bool AsyncProcessData(); void Send(u16 channelnum, SharedBuffer data, bool reliable); - //TODO: Remove - bool isFetchingBlocks(); - // Pops out a packet from the packet queue IncomingPacket getPacket();