From c297a75a7d4c8f05c5f0d4657a947648335ff85f Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 16 May 2015 22:14:15 +0200 Subject: [PATCH] Fix build since last commit Also rename method to better match what it does. --- src/clientiface.h | 8 ++++---- src/network/serverpackethandler.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/clientiface.h b/src/clientiface.h index 4707f4d9a..598662e2d 100644 --- a/src/clientiface.h +++ b/src/clientiface.h @@ -260,7 +260,7 @@ public: m_version_minor(0), m_version_patch(0), m_full_version("unknown"), - m_supported_compressions(0), + m_deployed_compression(0), m_connection_time(getTime(PRECISION_SECONDS)) { } @@ -337,8 +337,8 @@ public: void setPendingSerializationVersion(u8 version) { m_pending_serialization_version = version; } - void setSupportedCompressionModes(u16 byteFlag) - { m_supported_compressions = byteFlag; } + void setDeployedCompressionMode(u16 byteFlag) + { m_deployed_compression = byteFlag; } void confirmSerializationVersion() { serialization_version = m_pending_serialization_version; } @@ -416,7 +416,7 @@ private: std::string m_full_version; - u16 m_supported_compressions; + u16 m_deployed_compression; /* time this client was created diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 38b8b3cff..1eb7064d6 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -281,7 +281,7 @@ void Server::handleCommand_Init(NetworkPacket* pkt) Send(&resp_pkt); client->allowed_auth_mechs = auth_mechs; - client->setSupportedCompressionModes(compression_modes); + client->setDeployedCompressionMode(depl_compress_mode); m_clients.event(pkt->getPeerId(), CSE_Hello); } -- 2.25.1