diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/clientpackethandler.cpp | 2 | ||||
| -rw-r--r-- | src/network/connection.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index 25c1d2690..2933bb9f0 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -152,7 +152,7 @@ void Client::handleCommand_AuthAccept(NetworkPacket* pkt) language code (e.g. "de" for German). */ std::string lang = gettext("LANG_CODE"); if (lang == "LANG_CODE") - lang = ""; + lang.clear(); NetworkPacket resp_pkt(TOSERVER_INIT2, sizeof(u16) + lang.size()); resp_pkt << lang; diff --git a/src/network/connection.cpp b/src/network/connection.cpp index 6fb676f25..54ef5390c 100644 --- a/src/network/connection.cpp +++ b/src/network/connection.cpp @@ -64,7 +64,7 @@ BufferedPacketPtr makePacket(Address &address, const SharedBuffer<u8> &data, { u32 packet_size = data.getSize() + BASE_HEADER_SIZE; - BufferedPacketPtr p(new BufferedPacket(packet_size)); + auto p = std::make_shared<BufferedPacket>(packet_size); p->address = address; writeU32(&p->data[0], protocol_id); @@ -492,10 +492,10 @@ SharedBuffer<u8> IncomingSplitBuffer::insert(BufferedPacketPtr &p_ptr, bool reli void IncomingSplitBuffer::removeUnreliableTimedOuts(float dtime, float timeout) { - std::deque<u16> remove_queue; + std::vector<u16> remove_queue; { MutexAutoLock listlock(m_map_mutex); - for (auto &i : m_buf) { + for (const auto &i : m_buf) { IncomingSplitPacket *p = i.second; // Reliable ones are not removed by timeout if (p->reliable) |