Fix build since last commit
authorest31 <MTest31@outlook.com>
Sat, 16 May 2015 20:14:15 +0000 (22:14 +0200)
committerest31 <MTest31@outlook.com>
Sat, 16 May 2015 20:14:15 +0000 (22:14 +0200)
Also rename method to better match what it does.

src/clientiface.h
src/network/serverpackethandler.cpp

index 4707f4d9aabf81068ee6d8e09e79d1afe58deae9..598662e2dd1374813976f006de14d989485555d0 100644 (file)
@@ -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
index 38b8b3cffa327c42f316117ecb44258f28d33145..1eb7064d6f1fb4df10f3c47dd6d847b9edeef465 100644 (file)
@@ -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);
 }