diff options
author | Shauren <shauren.trinity@gmail.com> | 2022-01-23 20:31:52 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 20:31:52 +0100 |
commit | 596bf2b77218e6b959c1bf7de848c6f09d5a91f0 (patch) | |
tree | a129c1cf5e01ce8ba04d70348a01790b14105bf2 /src/server/game/Globals/ObjectMgr.cpp | |
parent | 770fbcca0cae18faac981a326d73996afc20b9ba (diff) |
Core/Misc: Replace boost::optional with std::optional part 2
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 51be3ecef7d..6c0684f5c71 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -10922,9 +10922,7 @@ void ObjectMgr::LoadPlayerChoices() continue; } - responseItr->Reward = boost::in_place(); - - PlayerChoiceResponseReward* reward = responseItr->Reward.get_ptr(); + PlayerChoiceResponseReward* reward = &responseItr->Reward.emplace(); reward->TitleId = fields[2].GetInt32(); reward->PackageId = fields[3].GetInt32(); reward->SkillLineId = fields[4].GetInt32(); @@ -11178,8 +11176,7 @@ void ObjectMgr::LoadPlayerChoices() continue; } - responseItr->MawPower.emplace(); - PlayerChoiceResponseMawPower& mawPower = responseItr->MawPower.get(); + PlayerChoiceResponseMawPower& mawPower = responseItr->MawPower.emplace(); mawPower.TypeArtFileID = fields[2].GetInt32(); mawPower.Rarity = fields[3].GetInt32(); mawPower.RarityColor = fields[4].GetUInt32(); |