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/Entities/Unit | |
| parent | 770fbcca0cae18faac981a326d73996afc20b9ba (diff) | |
Core/Misc: Replace boost::optional with std::optional part 2
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index a88ee60ea88..583edc58015 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5249,7 +5249,7 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo* damageInfo) int32 overkill = damageInfo->Damage - damageInfo->Target->GetHealth(); packet.OverDamage = (overkill < 0 ? -1 : overkill); - packet.SubDmg = boost::in_place(); + packet.SubDmg.emplace(); packet.SubDmg->SchoolMask = damageInfo->DamageSchoolMask; // School of sub damage packet.SubDmg->FDamage = damageInfo->Damage; // sub damage packet.SubDmg->Damage = damageInfo->Damage; // Sub Damage @@ -12271,7 +12271,7 @@ void Unit::SendClearTarget() int32 Unit::GetResistance(SpellSchoolMask mask) const { - Optional<int32> resist = boost::make_optional(false, 0); + Optional<int32> resist; for (int32 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i) { int32 schoolResistance = GetResistance(SpellSchools(i)); @@ -12279,7 +12279,7 @@ int32 Unit::GetResistance(SpellSchoolMask mask) const resist = schoolResistance; } - return resist ? *resist : 0; + return resist.value_or(0); } void CharmInfo::SetIsCommandAttack(bool val) |