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

Remove Queue class which uses std::list and use native std::queue

Browse source
This commit is contained in:
Loic Blot 2015-03-04 17:48:07 +01:00 • committed by Craig Robbins
parent 9e67579315
commit b214cde5b4
11 changed files with 85 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/server.cpp
View file

@ -906,7 +906,8 @@ void Server::AsyncRunStep(bool initial_step)
while(m_unsent_map_edit_queue.size() != 0)
{
MapEditEvent* event = m_unsent_map_edit_queue.pop_front();
MapEditEvent* event = m_unsent_map_edit_queue.front();
m_unsent_map_edit_queue.pop();
// Players far away from the change are stored here.
// Instead of sending the changes, MapBlocks are set not sent
@ -1292,7 +1293,7 @@ void Server::onMapEditEvent(MapEditEvent *event)
if(m_ignore_map_edit_events_area.contains(event->getArea()))
return;
MapEditEvent *e = event->clone();
m_unsent_map_edit_queue.push_back(e);
m_unsent_map_edit_queue.push(e);
}
Inventory* Server::getInventory(const InventoryLocation &loc)
@ -1395,7 +1396,7 @@ void Server::peerAdded(con::Peer *peer)
c.type = con::PEER_ADDED;
c.peer_id = peer->id;
c.timeout = false;
m_peer_change_queue.push_back(c);
m_peer_change_queue.push(c);
}
void Server::deletingPeer(con::Peer *peer, bool timeout)
@ -1409,7 +1410,7 @@ void Server::deletingPeer(con::Peer *peer, bool timeout)
c.type = con::PEER_REMOVED;
c.peer_id = peer->id;
c.timeout = timeout;
m_peer_change_queue.push_back(c);
m_peer_change_queue.push(c);
}
bool Server::getClientConInfo(u16 peer_id, con::rtt_stat_type type, float* retval)
@ -1458,7 +1459,8 @@ void Server::handlePeerChanges()
{
while(m_peer_change_queue.size() > 0)
{
con::PeerChange c = m_peer_change_queue.pop_front();
con::PeerChange c = m_peer_change_queue.front();
m_peer_change_queue.pop();
verbosestream<<"Server: Handling peer change: "
<<"id="<<c.peer_id<<", timeout="<<c.timeout
@ -1837,7 +1839,7 @@ void Server::SendPlayerHP(u16 peer_id)
// Send to other clients
std::string str = gob_cmd_punched(playersao->readDamage(), playersao->getHP());
ActiveObjectMessage aom(playersao->getId(), true, str);
playersao->m_messages_out.push_back(aom);
playersao->m_messages_out.push(aom);
}
void Server::SendPlayerBreath(u16 peer_id)