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

Replace NetworkPacket pointers to references

Browse source
This commit is contained in:
Loic Blot 2015-03-13 22:01:49 +01:00
parent 74d34da6cb
commit 083c8c734e
8 changed files with 256 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/network/connection.cpp
View file

@ -1725,9 +1725,8 @@ void ConnectionSendThread::connect(Address address)
// Send a dummy packet to server with peer_id = PEER_ID_INEXISTENT
m_connection->SetPeerID(PEER_ID_INEXISTENT);
NetworkPacket* pkt = new NetworkPacket(0,0);
m_connection->Send(PEER_ID_SERVER, 0, pkt, true);
delete pkt;
NetworkPacket pkt(0,0);
m_connection->Send(PEER_ID_SERVER, 0, &pkt, true);
}
void ConnectionSendThread::disconnect()

8
src/network/packethandlers/client.cpp
View file

@ -77,8 +77,8 @@ void Client::handleCommand_AuthAccept(NetworkPacket* pkt)
<< m_recommended_send_interval<<std::endl;
// Reply to server
NetworkPacket* resp_pkt = new NetworkPacket(TOSERVER_INIT2, 0);
Send(resp_pkt);
NetworkPacket resp_pkt(TOSERVER_INIT2, 0);
Send(&resp_pkt);
m_state = LC_Init;
}
@ -128,8 +128,8 @@ void Client::handleCommand_InitLegacy(NetworkPacket* pkt)
}
// Reply to server
NetworkPacket* resp_pkt = new NetworkPacket(TOSERVER_INIT2, 0);
Send(resp_pkt);
NetworkPacket resp_pkt(TOSERVER_INIT2, 0);
Send(&resp_pkt);
m_state = LC_Init;
}

6
src/network/packethandlers/server.cpp
View file

@ -617,14 +617,14 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt)
Answer with a TOCLIENT_INIT
*/
NetworkPacket* resp_pkt = new NetworkPacket(TOCLIENT_INIT_LEGACY, 1 + 6 + 8 + 4,
NetworkPacket resp_pkt(TOCLIENT_INIT_LEGACY, 1 + 6 + 8 + 4,
pkt->getPeerId());
*resp_pkt << (u8) deployed << (v3s16) floatToInt(v3f(0,0,0), BS)
resp_pkt << (u8) deployed << (v3s16) floatToInt(v3f(0,0,0), BS)
<< (u64) m_env->getServerMap().getSeed()
<< g_settings->getFloat("dedicated_server_step");
Send(resp_pkt);
Send(&resp_pkt);
m_clients.event(pkt->getPeerId(), CSE_Init);
}