jordan4ibanez
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed Client::isFetchingBlocks

master
Perttu Ahola 2011-01-07 14:53:01 +02:00
parent d38ac3aae3
commit ec509fac12
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client.cpp
View File

@ -1232,25 +1232,6 @@ void Client::Send(u16 channelnum, SharedBuffer<u8> data, bool reliable)
m_con.Send(PEER_ID_SERVER, channelnum, data, 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() IncomingPacket Client::getPacket()
{ {
JMutexAutoLock lock(m_incoming_queue_mutex); JMutexAutoLock lock(m_incoming_queue_mutex);

3
src/client.h
View File

@ -145,9 +145,6 @@ public:
bool AsyncProcessData(); bool AsyncProcessData();
void Send(u16 channelnum, SharedBuffer<u8> data, bool reliable); void Send(u16 channelnum, SharedBuffer<u8> data, bool reliable);
//TODO: Remove
bool isFetchingBlocks();
// Pops out a packet from the packet queue // Pops out a packet from the packet queue
IncomingPacket getPacket(); IncomingPacket getPacket();