From 67b19e741d6bdf9ed0cc84baeeb37cd970fb8d03 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 21 Jan 2022 14:22:06 +0100 Subject: [PATCH] Core/Misc: fixed several warnings that have been exposed by the new warnings --- src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp | 2 +- src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp | 2 +- src/server/game/Handlers/MiscHandler.cpp | 2 +- src/server/game/Miscellaneous/SharedDefines.h | 8 ++++---- src/server/game/Spells/SpellMgr.cpp | 2 +- src/server/shared/Packets/ByteBuffer.h | 9 ++++----- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index 0fcd573cd6..93b905e475 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -432,7 +432,7 @@ void BattlegroundAB::EventPlayerClickedOnFlag(Player* source, GameObject* /*targ TeamId teamIndex = GetTeamIndexByTeamId(source->GetTeam()); // Check if player really could use this banner, not cheated - if (!(m_Nodes[node] == 0 || teamIndex == m_Nodes[node]%2)) + if (!(m_Nodes[node] == 0 || teamIndex == uint8(m_Nodes[node] % 2))) return; source->RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags::PvPActive); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp index 1c998e52a0..14264b7583 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp @@ -410,7 +410,7 @@ void BattlegroundBFG::EventPlayerClickedOnFlag(Player* source, GameObject* /*tar TeamId teamIndex = GetTeamIndexByTeamId(source->GetTeam()); // Check if player really could use this banner, not cheated - if (!(m_Nodes[node] == 0 || teamIndex == m_Nodes[node] % 2)) + if (!(m_Nodes[node] == 0 || teamIndex == uint8(m_Nodes[node] % 2))) return; source->RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags::PvPActive); diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 9637bb0949..aabab8dfbd 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -261,7 +261,7 @@ void WorldSession::HandleWhoOpcode(WorldPackets::Who::WhoRequestPkt& whoRequest) if (!whoRequest.Request.Areas.empty()) { - if (std::find(whoRequest.Request.Areas.begin(), whoRequest.Request.Areas.end(), target.GetZoneId()) == whoRequest.Request.Areas.end()) + if (std::find(whoRequest.Request.Areas.begin(), whoRequest.Request.Areas.end(), int32(target.GetZoneId())) == whoRequest.Request.Areas.end()) continue; } diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 27adbca7e7..a38d164f44 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -263,7 +263,7 @@ enum SpellSchools MAX_SPELL_SCHOOL = 7 }; -enum SpellSchoolMask +enum SpellSchoolMask : uint32 { SPELL_SCHOOL_MASK_NONE = 0x00, // not exist SPELL_SCHOOL_MASK_NORMAL = (1 << SPELL_SCHOOL_NORMAL), // PHYSICAL (Armor) @@ -881,7 +881,7 @@ enum Language #define LANGUAGES_COUNT 21 -enum TeamId +enum TeamId : uint32 { TEAM_ALLIANCE = 0, TEAM_HORDE, @@ -1543,7 +1543,7 @@ enum AuraStateType (1<<(AURA_STATE_CONFLAGRATE-1))|(1<<(AURA_STATE_DEADLY_POISON-1))) // Spell mechanics -enum Mechanics +enum Mechanics : uint32 { MECHANIC_NONE = 0, MECHANIC_CHARM = 1, @@ -3179,7 +3179,7 @@ enum CreatureEliteType }; // values based at Holidays.dbc -enum HolidayIds +enum HolidayIds : uint32 { HOLIDAY_NONE = 0, diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index abaab66361..342be86b4d 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1500,7 +1500,7 @@ void SpellMgr::LoadSpellGroupStackRules() if (!spellInfo->Effects[i].IsAura()) continue; - int32 auraName = static_cast(spellInfo->Effects[i].ApplyAuraName); + uint32 auraName = spellInfo->Effects[i].ApplyAuraName; for (std::vector const& subGroup : SubGroups) { if (std::find(subGroup.begin(), subGroup.end(), auraName) != subGroup.end()) diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 46a49dec12..a46a42f123 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -74,7 +74,7 @@ class TC_SHARED_API ByteBuffer _storage.reserve(reserve); } - ByteBuffer(ByteBuffer&& buf) : _rpos(buf._rpos), _wpos(buf._wpos), + ByteBuffer(ByteBuffer&& buf) noexcept : _rpos(buf._rpos), _wpos(buf._wpos), _bitpos(buf._bitpos), _curbitval(buf._curbitval), _storage(std::move(buf._storage)) { buf._rpos = 0; @@ -100,7 +100,7 @@ class TC_SHARED_API ByteBuffer return *this; } - ByteBuffer& operator=(ByteBuffer&& right) + ByteBuffer& operator=(ByteBuffer&& right) noexcept { if (this != &right) { @@ -586,10 +586,9 @@ class TC_SHARED_API ByteBuffer void appendPackGUID(uint64 guid) { - uint8 packGUID[8+1]; - packGUID[0] = 0; + uint8 packGUID[8 + 1] = { }; size_t size = 1; - for (uint8 i = 0;guid != 0;++i) + for (uint8 i = 0; guid != 0; ++i) { if (guid & 0xFF) {