aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/AI/CreatureAIImpl.h2
-rw-r--r--src/server/game/AuctionHouseBot/AuctionHouseBot.h2
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
-rw-r--r--src/server/game/Guilds/Guild.cpp3
-rw-r--r--src/server/game/Guilds/Guild.h9
-rw-r--r--src/server/game/Server/Packets/QueryPackets.h8
-rw-r--r--src/server/game/Server/Packets/SpellPackets.h2
7 files changed, 14 insertions, 14 deletions
diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
index c50d2a2eb33..ff892ba28e1 100644
--- a/src/server/game/AI/CreatureAIImpl.h
+++ b/src/server/game/AI/CreatureAIImpl.h
@@ -75,7 +75,7 @@ enum SelectEffect : uint8
struct AISpellInfoType
{
AISpellInfoType() : target(AITARGET_SELF), condition(AICOND_COMBAT)
- , cooldown(AI_DEFAULT_COOLDOWN), realCooldown(0), maxRange(0.0f){ }
+ , cooldown(AI_DEFAULT_COOLDOWN), realCooldown(0), maxRange(0.0f), Targets(0), Effects(0) { }
AITarget target;
AICondition condition;
Milliseconds cooldown;
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouseBot/AuctionHouseBot.h
index d6d387467e5..64fbe85d907 100644
--- a/src/server/game/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/server/game/AuctionHouseBot/AuctionHouseBot.h
@@ -209,7 +209,7 @@ enum AuctionBotConfigFloatValues
class TC_GAME_API AuctionBotConfig
{
private:
- AuctionBotConfig(): _itemsPerCycleBoost(1000), _itemsPerCycleNormal(20) {}
+ AuctionBotConfig(): _itemsPerCycleBoost(1000), _itemsPerCycleNormal(20), _configUint32Values(), _configBoolValues(), _configFloatValues() { }
~AuctionBotConfig() {}
AuctionBotConfig(AuctionBotConfig const&) = delete;
AuctionBotConfig& operator=(AuctionBotConfig const&) = delete;
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index e88da62bb2f..ecc2ba48585 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -96,7 +96,7 @@ WorldPacket GameObjectTemplate::BuildQueryData(LocaleConstant loc) const
for (int32 item : *items)
stats.QuestItems.push_back(item);
- memcpy(stats.Data, raw.data, MAX_GAMEOBJECT_DATA * sizeof(int32));
+ memcpy(stats.Data.data(), raw.data, MAX_GAMEOBJECT_DATA * sizeof(int32));
stats.ContentTuningId = ContentTuningId;
queryTemp.Write();
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index a60aab6deea..c36c3510919 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -520,6 +520,7 @@ Guild::Member::Member(ObjectGuid::LowType guildId, ObjectGuid guid, GuildRankId
m_logoutTime(GameTime::GetGameTime()),
m_accountId(0),
m_rankId(rankId),
+ m_bankWithdraw(),
m_bankWithdrawMoney(0),
m_achievementPoints(0),
m_totalActivity(0),
@@ -1430,8 +1431,8 @@ void Guild::HandleSetAchievementTracking(WorldSession* session, uint32 const* ac
}
}
+ GetAchievementMgr().SendAllTrackedCriterias(player, criteriaIds);
member->SetTrackedCriteriaIds(std::move(criteriaIds));
- GetAchievementMgr().SendAllTrackedCriterias(player, member->GetTrackedCriteriaIds());
}
}
diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index 071e2c881da..f8aacf775c5 100644
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -352,9 +352,8 @@ class TC_GAME_API Guild
uint32 GetTotalReputation() const { return m_totalReputation; }
uint32 GetWeekReputation() const { return m_weekReputation; }
- std::set<uint32> const& GetTrackedCriteriaIds() const { return m_trackedCriteriaIds; }
void SetTrackedCriteriaIds(std::set<uint32> criteriaIds) { m_trackedCriteriaIds = std::move(criteriaIds); }
- bool IsTrackingCriteriaId(uint32 criteriaId) const { return m_trackedCriteriaIds.find(criteriaId) != m_trackedCriteriaIds.end(); }
+ bool IsTrackingCriteriaId(uint32 criteriaId) const { return m_trackedCriteriaIds && m_trackedCriteriaIds->contains(criteriaId); }
bool IsOnline() const { return (m_flags & GUILDMEMBER_STATUS_ONLINE); }
@@ -366,8 +365,8 @@ class TC_GAME_API Guild
void UpdateBankTabWithdrawValue(CharacterDatabaseTransaction trans, uint8 tabId, uint32 amount);
void UpdateBankMoneyWithdrawValue(CharacterDatabaseTransaction trans, uint64 amount);
- uint32 GetBankTabWithdrawValue(uint8 tabId) const { return m_bankWithdraw[tabId]; };
- uint64 GetBankMoneyWithdrawValue() const { return m_bankWithdrawMoney; };
+ uint32 GetBankTabWithdrawValue(uint8 tabId) const { return m_bankWithdraw[tabId]; }
+ uint64 GetBankMoneyWithdrawValue() const { return m_bankWithdrawMoney; }
void ResetValues(bool weekly = false);
Player* FindPlayer() const;
@@ -391,7 +390,7 @@ class TC_GAME_API Guild
std::string m_publicNote;
std::string m_officerNote;
- std::set<uint32> m_trackedCriteriaIds;
+ Optional<std::set<uint32>> m_trackedCriteriaIds;
std::array<uint32, GUILD_BANK_MAX_TABS> m_bankWithdraw;
uint64 m_bankWithdrawMoney;
diff --git a/src/server/game/Server/Packets/QueryPackets.h b/src/server/game/Server/Packets/QueryPackets.h
index ac4a9252245..3b2f9dfb1c8 100644
--- a/src/server/game/Server/Packets/QueryPackets.h
+++ b/src/server/game/Server/Packets/QueryPackets.h
@@ -210,8 +210,8 @@ namespace WorldPackets
uint32 TextID = 0;
bool Allow = false;
- std::array<float, MAX_NPC_TEXT_OPTIONS> Probabilities;
- std::array<uint32, MAX_NPC_TEXT_OPTIONS> BroadcastTextID;
+ std::array<float, MAX_NPC_TEXT_OPTIONS> Probabilities = { };
+ std::array<uint32, MAX_NPC_TEXT_OPTIONS> BroadcastTextID = { };
};
class QueryGameObject final : public ClientPacket
@@ -233,7 +233,7 @@ namespace WorldPackets
std::string UnkString;
uint32 Type = 0;
uint32 DisplayID = 0;
- uint32 Data[MAX_GAMEOBJECT_DATA];
+ std::array<uint32, MAX_GAMEOBJECT_DATA> Data = { };
float Size = 0.0f;
std::vector<int32> QuestItems;
uint32 ContentTuningId = 0;
@@ -326,7 +326,7 @@ namespace WorldPackets
void Read() override;
int32 MissingQuestCount = 0;
- std::array<int32, 175> MissingQuestPOIs;
+ std::array<int32, 175> MissingQuestPOIs = { };
};
class QuestPOIQueryResponse final : public ServerPacket
diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h
index 3273e2dd8c3..f344eb53899 100644
--- a/src/server/game/Server/Packets/SpellPackets.h
+++ b/src/server/game/Server/Packets/SpellPackets.h
@@ -368,7 +368,7 @@ namespace WorldPackets
std::vector<SpellPowerData> RemainingPower;
Optional<RuneData> RemainingRunes;
MissileTrajectoryResult MissileTrajectory;
- int32 AmmoDisplayID;
+ int32 AmmoDisplayID = 0;
uint8 DestLocSpellCastIndex = 0;
std::vector<TargetLocation> TargetPoints;
CreatureImmunities Immunities;