From 7279f0b37335396c85f6bdd7dc67ff56e53df0f9 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sat, 14 Jan 2017 16:48:49 +0100 Subject: Add particle animation, glow This is implemented by reusing and extending the TileAnimation code for the methods used by particles. --- src/network/networkpacket.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/network/networkpacket.cpp') diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp index 388afc18e..91e6c58e2 100644 --- a/src/network/networkpacket.cpp +++ b/src/network/networkpacket.cpp @@ -63,7 +63,7 @@ void NetworkPacket::putRawPacket(u8 *data, u32 datasize, u16 peer_id) m_data = std::vector(&data[2], &data[2 + m_datasize]); } -char* NetworkPacket::getString(u32 from_offset) +const char* NetworkPacket::getString(u32 from_offset) { checkReadOffset(from_offset, 0); -- cgit v1.2.3 From b1e6c2a9b8f10254c027fe227811fc300bae2048 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 14 Apr 2017 18:26:24 +0200 Subject: NetworkPacket: don't copy push std::string and std::wstring --- src/network/networkpacket.cpp | 6 +++--- src/network/networkpacket.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/network/networkpacket.cpp') diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp index 91e6c58e2..f7a6499dd 100644 --- a/src/network/networkpacket.cpp +++ b/src/network/networkpacket.cpp @@ -105,7 +105,7 @@ NetworkPacket& NetworkPacket::operator>>(std::string& dst) return *this; } -NetworkPacket& NetworkPacket::operator<<(std::string src) +NetworkPacket& NetworkPacket::operator<<(const std::string &src) { u16 msgsize = src.size(); if (msgsize > STRING_MAX_LEN) { @@ -119,7 +119,7 @@ NetworkPacket& NetworkPacket::operator<<(std::string src) return *this; } -void NetworkPacket::putLongString(std::string src) +void NetworkPacket::putLongString(const std::string &src) { u32 msgsize = src.size(); if (msgsize > LONG_STRING_MAX_LEN) { @@ -155,7 +155,7 @@ NetworkPacket& NetworkPacket::operator>>(std::wstring& dst) return *this; } -NetworkPacket& NetworkPacket::operator<<(std::wstring src) +NetworkPacket& NetworkPacket::operator<<(const std::wstring &src) { u16 msgsize = src.size(); if (msgsize > WIDE_STRING_MAX_LEN) { diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h index 3e436aba9..83dc33f6f 100644 --- a/src/network/networkpacket.h +++ b/src/network/networkpacket.h @@ -52,12 +52,12 @@ public: { 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(); -- cgit v1.2.3