diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-03-30 19:06:11 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-03-30 19:06:11 +0200 |
| commit | 3cc50e69f1ece93e8542fb43575453ae4bcc5e61 (patch) | |
| tree | e771165c1f4dd9c82407207634cb6023f3dd9520 /src/server/game/Guilds | |
| parent | 642dd62cc7b8bfc4d4d04d2d06462737d73fcfe6 (diff) | |
Core/Players: Fixed racemasks usage for new races
Diffstat (limited to 'src/server/game/Guilds')
| -rw-r--r-- | src/server/game/Guilds/Guild.h | 3 | ||||
| -rw-r--r-- | src/server/game/Guilds/GuildMgr.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 5adb0af4701..3e36c839e11 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -21,6 +21,7 @@ #include "AchievementMgr.h" #include "DatabaseEnvFwd.h" #include "ObjectGuid.h" +#include "RaceMask.h" #include "SharedDefines.h" #include <unordered_map> @@ -251,7 +252,7 @@ struct GuildReward { uint32 ItemID; uint8 MinGuildRep; - uint64 RaceMask; + Trinity::RaceMask<uint64> RaceMask; uint64 Cost; std::vector<uint32> AchievementsRequired; }; diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp index e891f9a6d26..65ed69f79af 100644 --- a/src/server/game/Guilds/GuildMgr.cpp +++ b/src/server/game/Guilds/GuildMgr.cpp @@ -515,7 +515,7 @@ void GuildMgr::LoadGuildRewards() Field* fields = result->Fetch(); reward.ItemID = fields[0].GetUInt32(); reward.MinGuildRep = fields[1].GetUInt8(); - reward.RaceMask = fields[2].GetUInt64(); + reward.RaceMask.RawValue = fields[2].GetUInt64(); reward.Cost = fields[3].GetUInt64(); if (!sObjectMgr->GetItemTemplate(reward.ItemID)) |