forked from Mirrorlandia_minetest/minetest
Remove unused ConnectionCommand::sendToAll function. NetworkPacket::oldForgePacket returns Buffer instead of SharedBuffer and is used in ConnectionCommand instead of Connection::Send
This remove the NetworkPacket buffer => SharedBuffer => Buffer copy. Now NetworkPacket => Buffer
This commit is contained in:
parent
761b127060
commit
61f2d0ca34
@ -2924,7 +2924,7 @@ void Connection::Send(u16 peer_id, u8 channelnum,
|
||||
|
||||
ConnectionCommand c;
|
||||
|
||||
c.send(peer_id, channelnum, pkt->oldForgePacket(), reliable);
|
||||
c.send(peer_id, channelnum, pkt, reliable);
|
||||
putCommand(c);
|
||||
}
|
||||
|
||||
|
@ -437,19 +437,12 @@ struct ConnectionCommand
|
||||
peer_id = peer_id_;
|
||||
}
|
||||
void send(u16 peer_id_, u8 channelnum_,
|
||||
SharedBuffer<u8> data_, bool reliable_)
|
||||
NetworkPacket* pkt, bool reliable_)
|
||||
{
|
||||
type = CONNCMD_SEND;
|
||||
peer_id = peer_id_;
|
||||
channelnum = channelnum_;
|
||||
data = data_;
|
||||
reliable = reliable_;
|
||||
}
|
||||
void sendToAll(u8 channelnum_, SharedBuffer<u8> data_, bool reliable_)
|
||||
{
|
||||
type = CONNCMD_SEND_TO_ALL;
|
||||
channelnum = channelnum_;
|
||||
data = data_;
|
||||
data = pkt->oldForgePacket();
|
||||
reliable = reliable_;
|
||||
}
|
||||
|
||||
|
@ -510,7 +510,7 @@ NetworkPacket& NetworkPacket::operator<<(video::SColor src)
|
||||
return *this;
|
||||
}
|
||||
|
||||
SharedBuffer<u8> NetworkPacket::oldForgePacket()
|
||||
Buffer<u8> NetworkPacket::oldForgePacket()
|
||||
{
|
||||
SharedBuffer<u8> sb(m_datasize + 2);
|
||||
writeU16(&sb[0], m_command);
|
||||
|
@ -104,7 +104,7 @@ public:
|
||||
NetworkPacket& operator<<(video::SColor src);
|
||||
|
||||
// Temp, we remove SharedBuffer when migration finished
|
||||
SharedBuffer<u8> oldForgePacket();
|
||||
Buffer<u8> oldForgePacket();
|
||||
private:
|
||||
template<typename T> void checkDataSize()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user