diff options
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Handlers/QueryHandler.cpp | 14 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellHistory.cpp | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index d7c67efa72d..cfe93b0cde3 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -398,7 +398,7 @@ template<class T> AchievementMgr<T>::~AchievementMgr() { } template<class T> -void AchievementMgr<T>::SendPacket(WorldPacket const* data) const { } +void AchievementMgr<T>::SendPacket(WorldPacket const* /*data*/) const { } template<> void AchievementMgr<Guild>::SendPacket(WorldPacket const* data) const diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index 9ed3fb48b28..50848e51510 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -238,8 +238,6 @@ void WorldSession::HandleQueryPageText(WorldPackets::Query::QueryPageText& packe { PageText const* pageText = sObjectMgr->GetPageText(pageID); - std::string text = pageText->Text; - WorldPackets::Query::QueryPageTextResponse response; response.PageTextID = pageID; @@ -250,15 +248,15 @@ void WorldSession::HandleQueryPageText(WorldPackets::Query::QueryPageText& packe } else { - LocaleConstant localeConstant = GetSessionDbLocaleIndex(); - if (localeConstant >= LOCALE_enUS) - if (PageTextLocale const* pageTextLocale = sObjectMgr->GetPageTextLocale(pageID)) - ObjectMgr::GetLocaleString(pageTextLocale->Text, localeConstant, text); - response.Allow = true; response.Info.ID = pageID; response.Info.NextPageID = pageText->NextPageID; - response.Info.Text = text; + response.Info.Text = pageText->Text; + + LocaleConstant localeConstant = GetSessionDbLocaleIndex(); + if (localeConstant >= LOCALE_enUS) + if (PageTextLocale const* pageTextLocale = sObjectMgr->GetPageTextLocale(pageID)) + ObjectMgr::GetLocaleString(pageTextLocale->Text, localeConstant, response.Info.Text); pageID = pageText->NextPageID; } diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index 40d5d75ba6f..54e33078622 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -783,7 +783,7 @@ bool SpellHistory::HasCharge(SpellCategoryEntry const* chargeCategoryEntry) cons return true; auto itr = _categoryCharges.find(chargeCategoryEntry->ID); - return itr == _categoryCharges.end() || itr->second.size() < maxCharges; + return itr == _categoryCharges.end() || int32(itr->second.size()) < maxCharges; } int32 SpellHistory::GetMaxCharges(SpellCategoryEntry const* chargeCategoryEntry) const |