Merge 0.4.16 into stable-0.4

1 files changed, 7 insertions, 4 deletions

diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
index 524470999..83dc33f6f 100644
--- a/src/network/networkpacket.h
+++ b/src/network/networkpacket.h
@@ -41,20 +41,23 @@ public:
 		u16 getPeerId() { return m_peer_id; }
 		u16 getCommand() { return m_command; }
 		const u32 getRemainingBytes() const { return m_datasize - m_read_offset; }
+		const char* getRemainingString() { return getString(m_read_offset); }
 
 		// Returns a c-string without copying.
 		// A better name for this would be getRawString()
-		char* getString(u32 from_offset);
+		const char* getString(u32 from_offset);
 		// major difference to putCString(): doesn't write len into the buffer
 		void putRawString(const char* src, u32 len);
+		void putRawString(const std::string &src)
+			{ putRawString(src.c_str(), src.size()); }
 
 		NetworkPacket& operator>>(std::string& dst);
-		NetworkPacket& operator<<(std::string src);
+		NetworkPacket& operator<<(const std::string &src);
 
-		void putLongString(std::string src);
+		void putLongString(const std::string &src);
 
 		NetworkPacket& operator>>(std::wstring& dst);
-		NetworkPacket& operator<<(std::wstring src);
+		NetworkPacket& operator<<(const std::wstring &src);
 
 		std::string readLongString();