oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

commit before content-tile separation

Browse source
This commit is contained in:
Perttu Ahola 2010-12-13 21:32:35 +02:00
parent 22037459e3
commit 3ac2abb0b5
14 changed files with 368 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/server.cpp
View file

@ -412,8 +412,10 @@ void RemoteClient::GetNextBlocks(Server *server, float dtime,
maximum_simultaneous_block_sends;
if(d <= BLOCK_SEND_DISABLE_LIMITS_MAX_D)
maximum_simultaneous_block_sends_now =
maximum_simultaneous_block_sends_setting;
{
maximum_simultaneous_block_sends_now =
maximum_simultaneous_block_sends_setting;
}
{
JMutexAutoLock lock(m_blocks_sending_mutex);
@ -971,11 +973,19 @@ void Server::AsyncRunStep()
{
JMutexAutoLock lock1(m_step_dtime_mutex);
dtime = m_step_dtime;
if(dtime < 0.001)
return;
m_step_dtime = 0.0;
}
// Send blocks to clients
SendBlocks(dtime);
if(dtime < 0.001)
return;
{
JMutexAutoLock lock1(m_step_dtime_mutex);
m_step_dtime = 0.0;
}
//dstream<<"Server steps "<<dtime<<std::endl;
//dstream<<"Server::AsyncRunStep(): dtime="<<dtime<<std::endl;
@ -1098,9 +1108,6 @@ void Server::AsyncRunStep()
}
}*/
// Send blocks to clients
SendBlocks(dtime);
// Send object positions
{
static float counter = 0.0;
@ -1876,7 +1883,8 @@ void Server::SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver)
writeS16(&reply[6], p.Z);
memcpy(&reply[8], *blockdata, blockdata.getSize());
//dstream<<"Sending block: packet size: "<<replysize<<std::endl;
dstream<<"Sending block ("<<p.X<<","<<p.Y<<","<<p.Z<<")"
<<": \tpacket size: "<<replysize<<std::endl;
/*
Send packet