Remove unused ConnectionCommand::sendToAll function. NetworkPacket::oldForgePacket returns Buffer instead of SharedBuffer and is used in ConnectionCommand instead of Connection::Send

nerzhul · nerzhul · commit 61f2d0ca3417 · 2015-03-22T12:18:16.000+01:00
This remove the NetworkPacket buffer =&gt; SharedBuffer =&gt; Buffer copy. Now NetworkPacket =&gt; Buffer
diff --git a/src/network/connection.cpp b/src/network/connection.cpp
@@ -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);
 }
 
diff --git a/src/network/connection.h b/src/network/connection.h
@@ -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_;
 	}
 
diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp
@@ -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);
diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
@@ -104,7 +104,7 @@ class NetworkPacket
 		NetworkPacket& operator<<(video::SColor src);
 
 		// Temp, we remove SharedBuffer when migration finished
-		SharedBuffer<u8> oldForgePacket();
+		Buffer<u8> oldForgePacket();
 private:
 		template<typename T> void checkDataSize()
 		{

Original file line number	Diff line number	Diff line change
`@@ -2924,7 +2924,7 @@ void Connection::Send(u16 peer_id, u8 channelnum,`
`2924`	`2924`
`2925`	`2925`	`ConnectionCommand c;`
`2926`	`2926`
`2927`		`- c.send(peer_id, channelnum, pkt->oldForgePacket(), reliable);`
	`2927`	`+ c.send(peer_id, channelnum, pkt, reliable);`
`2928`	`2928`	`putCommand(c);`
`2929`	`2929`	`}`
`2930`	`2930`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ NetworkPacket& NetworkPacket::operator<<(video::SColor src)`
`510`	`510`	`return *this;`
`511`	`511`	`}`
`512`	`512`
`513`		`-SharedBuffer<u8> NetworkPacket::oldForgePacket()`
	`513`	`+Buffer<u8> NetworkPacket::oldForgePacket()`
`514`	`514`	`{`
`515`	`515`	`SharedBuffer<u8> sb(m_datasize + 2);`
`516`	`516`	`writeU16(&sb[0], m_command);`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class NetworkPacket`
`104`	`104`	`NetworkPacket& operator<<(video::SColor src);`
`105`	`105`
`106`	`106`	`// Temp, we remove SharedBuffer when migration finished`
`107`		`- SharedBuffer<u8> oldForgePacket();`
	`107`	`+ Buffer<u8> oldForgePacket();`
`108`	`108`	`private:`
`109`	`109`	`template<typename T> void checkDataSize()`
`110`	`110`	`{`