diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Guilds/Guild.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Handlers/ReferAFriendHandler.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Spells/SpellHistory.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Support/SupportMgr.cpp | 6 | ||||
-rw-r--r-- | src/server/game/Support/SupportMgr.h | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index b594e694416..e63c8e5feaa 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -24573,7 +24573,7 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot) --loot->unlootedCount; - if (ItemTemplate const* proto = sObjectMgr->GetItemTemplate(item->itemid)) + if (sObjectMgr->GetItemTemplate(item->itemid)) if (newitem->GetQuality() > ITEM_QUALITY_EPIC || (newitem->GetQuality() == ITEM_QUALITY_EPIC && newitem->GetItemLevel() >= MinNewsItemLevel[sWorld->getIntConfig(CONFIG_EXPANSION)])) if (Guild* guild = GetGuild()) guild->AddGuildNews(GUILD_NEWS_ITEM_LOOTED, GetGUID(), 0, item->itemid); diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index d042fd31e27..feb419a011a 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -3631,7 +3631,7 @@ void ObjectMgr::LoadQuests() } } - if (qinfo->MinLevel == uint32(-1) || qinfo->MinLevel > DEFAULT_MAX_LEVEL) + if (qinfo->MinLevel == -1 || qinfo->MinLevel > DEFAULT_MAX_LEVEL) { TC_LOG_ERROR("sql.sql", "Quest %u should be disabled because `MinLevel` = %i", qinfo->GetQuestId(), int32(qinfo->MinLevel)); // no changes needed, sending -1 in SMSG_QUEST_QUERY_RESPONSE is valid diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index fa7223205d5..6bc7dcf5538 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -3213,7 +3213,7 @@ void Guild::_SendBankContentUpdate(uint8 tabId, SlotIds slots) const { uint32 enchants = 0; for (uint32 ench = 0; ench < MAX_ENCHANTMENT_SLOT; ++ench) - if (uint32 enchantId = tabItem->GetEnchantmentId(EnchantmentSlot(ench))) + if (tabItem->GetEnchantmentId(EnchantmentSlot(ench))) ++enchants; itemInfo.SocketEnchant.reserve(enchants); @@ -3301,7 +3301,7 @@ void Guild::SendBankList(WorldSession* session, uint8 tabId, bool fullUpdate) co uint32 enchants = 0; for (uint32 ench = 0; ench < MAX_ENCHANTMENT_SLOT; ++ench) - if (uint32 enchantId = tabItem->GetEnchantmentId(EnchantmentSlot(ench))) + if (tabItem->GetEnchantmentId(EnchantmentSlot(ench))) ++enchants; itemInfo.SocketEnchant.reserve(enchants); diff --git a/src/server/game/Handlers/ReferAFriendHandler.cpp b/src/server/game/Handlers/ReferAFriendHandler.cpp index 4db76480f21..4610f737fce 100644 --- a/src/server/game/Handlers/ReferAFriendHandler.cpp +++ b/src/server/game/Handlers/ReferAFriendHandler.cpp @@ -32,7 +32,7 @@ void WorldSession::HandleGrantLevel(WorldPacket& recvData) // check cheating /* TODO: 6.x update lfg system - /*uint8 levels = _player->GetGrantableLevels(); + uint8 levels = _player->GetGrantableLevels(); uint8 error = 0; if (!target) error = ERR_REFER_A_FRIEND_NO_TARGET; diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index db8cb880d28..5611480b2f6 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -244,7 +244,7 @@ bool SpellHistory::IsReady(SpellInfo const* spellInfo) const } template<class PacketType> -void SpellHistory::WritePacket(PacketType* packet) const +void SpellHistory::WritePacket(PacketType* /*packet*/) const { static_assert(!std::is_same<PacketType, PacketType>::value /*static_assert(false)*/, "This packet is not supported."); } @@ -590,7 +590,7 @@ void SpellHistory::ResetCooldown(CooldownStorageType::iterator& itr, bool update void SpellHistory::ResetAllCooldowns() { - if (Player* playerOwner = GetPlayerOwner()) + if (GetPlayerOwner()) { std::vector<int32> cooldowns; cooldowns.reserve(_spellCooldowns.size()); diff --git a/src/server/game/Support/SupportMgr.cpp b/src/server/game/Support/SupportMgr.cpp index 5040608d48b..43be35de7e2 100644 --- a/src/server/game/Support/SupportMgr.cpp +++ b/src/server/game/Support/SupportMgr.cpp @@ -518,9 +518,9 @@ std::string SuggestionTicket::FormatViewMessageString(ChatHandler& handler, bool return ss.str(); } -SupportMgr::SupportMgr() : _lastGmTicketId(0), _lastBugId(0), _lastComplaintId(0), _lastSuggestionId(0), _openGmTicketCount(0), -_openBugTicketCount(0), _openComplaintTicketCount(0), _openSuggestionTicketCount(0), _lastChange(0), _supportSystemStatus(false), -_bugSystemStatus(false), _complaintSystemStatus(false), _suggestionSystemStatus(false) { } +SupportMgr::SupportMgr() : _supportSystemStatus(false), _ticketSystemStatus(false), _bugSystemStatus(false), _complaintSystemStatus(false), _suggestionSystemStatus(false), +_lastGmTicketId(0), _lastBugId(0), _lastComplaintId(0), _lastSuggestionId(0), _lastChange(0), +_openGmTicketCount(0), _openBugTicketCount(0), _openComplaintTicketCount(0), _openSuggestionTicketCount(0) { } SupportMgr::~SupportMgr() { diff --git a/src/server/game/Support/SupportMgr.h b/src/server/game/Support/SupportMgr.h index eddb3cebf75..fbaf75753d5 100644 --- a/src/server/game/Support/SupportMgr.h +++ b/src/server/game/Support/SupportMgr.h @@ -404,11 +404,11 @@ private: uint32 _lastBugId; uint32 _lastComplaintId; uint32 _lastSuggestionId; + uint64 _lastChange; uint32 _openGmTicketCount; uint32 _openBugTicketCount; uint32 _openComplaintTicketCount; uint32 _openSuggestionTicketCount; - uint64 _lastChange; }; #define sSupportMgr SupportMgr::instance() |