From 208378713b3e80cc5869de2ca403947497173078 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 7 Jul 2023 23:34:03 +0200 Subject: [PATCH] Core/Misc: fixed more warnings --- src/server/game/Entities/Object/Position.cpp | 2 +- src/server/game/Entities/Object/Position.h | 4 ++-- src/server/game/Server/WorldPacket.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp index bda78f7abf..7498e3ae61 100644 --- a/src/server/game/Entities/Object/Position.cpp +++ b/src/server/game/Entities/Object/Position.cpp @@ -23,7 +23,7 @@ #include #include -bool Position::operator==(Position const& a) +bool Position::operator==(Position const& a) const { return (G3D::fuzzyEq(a.m_positionX, m_positionX) && G3D::fuzzyEq(a.m_positionY, m_positionY) && diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h index 32334fb3f0..b3b5e79319 100644 --- a/src/server/game/Entities/Object/Position.h +++ b/src/server/game/Entities/Object/Position.h @@ -58,9 +58,9 @@ private: float m_orientation; public: - bool operator==(Position const& a); + bool operator==(Position const& a) const; - inline bool operator!=(Position const& a) + inline bool operator!=(Position const& a) const { return !(operator==(a)); } diff --git a/src/server/game/Server/WorldPacket.cpp b/src/server/game/Server/WorldPacket.cpp index e3c0a565e9..fb321a4954 100644 --- a/src/server/game/Server/WorldPacket.cpp +++ b/src/server/game/Server/WorldPacket.cpp @@ -25,7 +25,7 @@ void WorldPacket::Compress(z_stream* compressionStream) { OpcodeServer uncompressedOpcode = OpcodeServer(GetOpcode()); - if (uncompressedOpcode & COMPRESSED_OPCODE_MASK) + if (uncompressedOpcode & AsUnderlyingType(COMPRESSED_OPCODE_MASK)) { TC_LOG_ERROR("network", "Packet with opcode 0x%04X is already compressed!", uncompressedOpcode); return;