From 19062b5c77f8176b24bc581a64e19ea1ef631b59 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Mon, 27 Jun 2022 13:12:39 +0200 Subject: [PATCH] fix warnings --- src/protocol/Protocol.cpp | 77 +++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/src/protocol/Protocol.cpp b/src/protocol/Protocol.cpp index 1db5b48..4c381f1 100644 --- a/src/protocol/Protocol.cpp +++ b/src/protocol/Protocol.cpp @@ -12,19 +12,18 @@ namespace protocol { const int BITS_IN_BYTE = 8; const int BITS_IN_LONG = BITS_IN_BYTE * sizeof(std::uint64_t); -unsigned int countBits(unsigned int number) { +static unsigned int countBits(unsigned int number) { // log function in base 2 // take only integer part return static_cast(std::log2(number) + 1); } void Packet::WritePacketID(DataBuffer& data, bool packetID) const { - if (packetID) { + if (packetID) data << GetID(); - } } -DataBuffer& operator<<(DataBuffer& buffer, game::TilePtr tile) { +static DataBuffer& operator<<(DataBuffer& buffer, game::TilePtr tile) { buffer << tile->GetType(); switch (tile->GetType()) { @@ -54,7 +53,7 @@ DataBuffer& operator<<(DataBuffer& buffer, game::TilePtr tile) { return buffer; } -DataBuffer& operator>>(DataBuffer& buffer, game::TilePtr& tile) { +static DataBuffer& operator>>(DataBuffer& buffer, game::TilePtr& tile) { game::TileType tileType; buffer >> tileType; switch (tileType) { @@ -102,7 +101,7 @@ DataBuffer WorldBeginDataPacket::Serialize(bool packetID) const { WritePacketID(data, packetID); data << towerTilePalette << m_Header.m_World->GetWalkableTileColor() - << (std::uint16_t)decoTilePalette.size(); + << static_cast(decoTilePalette.size()); // deco color palette std::size_t bufferSize = data.GetSize(); @@ -192,12 +191,12 @@ DataBuffer WorldDataPacket::Serialize(bool packetID) const { ChunkPackedData chunkData(game::Chunk::ChunkSize / (BITS_IN_BYTE * sizeof(ChunkPackedData::value_type) / bitsPerTile), 0); - for (int tileNumber = 0; tileNumber < game::Chunk::ChunkSize; tileNumber++) { - int startLong = (tileNumber * bitsPerTile) / BITS_IN_LONG; - int startOffset = (tileNumber * bitsPerTile) % BITS_IN_LONG; - int endLong = ((tileNumber + 1) * bitsPerTile - 1) / BITS_IN_LONG; + for (unsigned int tileNumber = 0; tileNumber < game::Chunk::ChunkSize; tileNumber++) { + std::size_t startLong = static_cast((tileNumber * bitsPerTile) / BITS_IN_LONG); + std::size_t startOffset = static_cast((tileNumber * bitsPerTile) % BITS_IN_LONG); + std::size_t endLong = static_cast(((tileNumber + 1) * bitsPerTile - 1) / BITS_IN_LONG); - std::uint64_t value = chunk->tiles[tileNumber]; + std::uint64_t value = static_cast(chunk->tiles[tileNumber]); value &= individualValueMask; @@ -245,10 +244,10 @@ void WorldDataPacket::Deserialize(DataBuffer& data) { memcpy(reinterpret_cast(chunkData.data()), data.data() + data.GetReadOffset(), chunkData.size() * sizeof(ChunkPackedData::value_type)); data.SetReadOffset(data.GetReadOffset() + chunkData.size() * sizeof(ChunkPackedData::value_type)); - for (int tileNumber = 0; tileNumber < game::Chunk::ChunkSize; tileNumber++) { - int startLong = (tileNumber * bitsPerTile) / BITS_IN_LONG; - int startOffset = (tileNumber * bitsPerTile) % BITS_IN_LONG; - int endLong = ((tileNumber + 1) * bitsPerTile - 1) / BITS_IN_LONG; + for (unsigned int tileNumber = 0; tileNumber < game::Chunk::ChunkSize; tileNumber++) { + std::size_t startLong = (tileNumber * bitsPerTile) / BITS_IN_LONG; + std::size_t startOffset = (tileNumber * bitsPerTile) % BITS_IN_LONG; + std::size_t endLong = ((tileNumber + 1) * bitsPerTile - 1) / BITS_IN_LONG; game::Chunk::ChunkData::value_type value; if (startLong == endLong) { @@ -549,30 +548,30 @@ void UpdateMobStatesPacket::Deserialize(DataBuffer& data) { } } -REGISTER_DISPATCH_CLASS(PlayerLoginPacket); -REGISTER_DISPATCH_CLASS(WorldBeginDataPacket); -REGISTER_DISPATCH_CLASS(WorldDataPacket); -REGISTER_DISPATCH_CLASS(KeepAlivePacket); -REGISTER_DISPATCH_CLASS(UpdateExpPacket); -REGISTER_DISPATCH_CLASS(UpdateMoneyPacket); -REGISTER_DISPATCH_CLASS(UpdateLobbyTimePacket); -REGISTER_DISPATCH_CLASS(UpdateGameStatePacket); -REGISTER_DISPATCH_CLASS(PlayerListPacket); -REGISTER_DISPATCH_CLASS(PlayerJoinPacket); -REGISTER_DISPATCH_CLASS(PlayerLeavePacket); -REGISTER_DISPATCH_CLASS(ConnexionInfoPacket); -REGISTER_DISPATCH_CLASS(SelectTeamPacket); -REGISTER_DISPATCH_CLASS(UpdatePlayerTeamPacket); -REGISTER_DISPATCH_CLASS(DisconnectPacket); -REGISTER_DISPATCH_CLASS(ServerTpsPacket); -REGISTER_DISPATCH_CLASS(SpawnMobPacket); -REGISTER_DISPATCH_CLASS(PlaceTowerPacket); -REGISTER_DISPATCH_CLASS(WorldAddTowerPacket); -REGISTER_DISPATCH_CLASS(RemoveTowerPacket); -REGISTER_DISPATCH_CLASS(SendMobsPacket); -REGISTER_DISPATCH_CLASS(UpgradeTowerPacket); -REGISTER_DISPATCH_CLASS(UpdateCastleLifePacket); -REGISTER_DISPATCH_CLASS(UpdateMobStatesPacket); +REGISTER_DISPATCH_CLASS(PlayerLoginPacket) +REGISTER_DISPATCH_CLASS(WorldBeginDataPacket) +REGISTER_DISPATCH_CLASS(WorldDataPacket) +REGISTER_DISPATCH_CLASS(KeepAlivePacket) +REGISTER_DISPATCH_CLASS(UpdateExpPacket) +REGISTER_DISPATCH_CLASS(UpdateMoneyPacket) +REGISTER_DISPATCH_CLASS(UpdateLobbyTimePacket) +REGISTER_DISPATCH_CLASS(UpdateGameStatePacket) +REGISTER_DISPATCH_CLASS(PlayerListPacket) +REGISTER_DISPATCH_CLASS(PlayerJoinPacket) +REGISTER_DISPATCH_CLASS(PlayerLeavePacket) +REGISTER_DISPATCH_CLASS(ConnexionInfoPacket) +REGISTER_DISPATCH_CLASS(SelectTeamPacket) +REGISTER_DISPATCH_CLASS(UpdatePlayerTeamPacket) +REGISTER_DISPATCH_CLASS(DisconnectPacket) +REGISTER_DISPATCH_CLASS(ServerTpsPacket) +REGISTER_DISPATCH_CLASS(SpawnMobPacket) +REGISTER_DISPATCH_CLASS(PlaceTowerPacket) +REGISTER_DISPATCH_CLASS(WorldAddTowerPacket) +REGISTER_DISPATCH_CLASS(RemoveTowerPacket) +REGISTER_DISPATCH_CLASS(SendMobsPacket) +REGISTER_DISPATCH_CLASS(UpgradeTowerPacket) +REGISTER_DISPATCH_CLASS(UpdateCastleLifePacket) +REGISTER_DISPATCH_CLASS(UpdateMobStatesPacket) } // namespace protocol } // namespace td \ No newline at end of file