diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-03-07 00:23:52 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-03-07 00:23:52 +0100 |
| commit | 45ee989c70682c001d4467d97bf1ecedcf7dbcc3 (patch) | |
| tree | e36b3b8bf55bab550598ef87d3420aba0332793c /src/server/game/Spells/Spell.cpp | |
| parent | 1f73cf9f19679f5b888f9df475b94c9405f2d746 (diff) | |
Core/vmaps: Removed vmap lookup functions duplicating functionality of each other
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index fff10534611..a424e24a7bc 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -830,8 +830,7 @@ void Spell::SelectSpellTargets() if (m_spellInfo->HasAttribute(SPELL_ATTR8_REQUIRES_LOCATION_TO_BE_ON_LIQUID_SURFACE)) { ZLiquidStatus status = m_caster->GetMap()->GetLiquidStatus(m_caster->GetPhaseShift(), - m_targets.GetDstPos()->GetPositionX(), m_targets.GetDstPos()->GetPositionY(), m_targets.GetDstPos()->GetPositionZ(), - map_liquidHeaderTypeFlags::AllLiquids); + m_targets.GetDstPos()->GetPositionX(), m_targets.GetDstPos()->GetPositionY(), m_targets.GetDstPos()->GetPositionZ()); if (!(status & (LIQUID_MAP_WATER_WALK | LIQUID_MAP_IN_WATER))) { SendCastResult(SPELL_FAILED_NO_LIQUID); @@ -1512,7 +1511,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffectInfo const& spellEffectIn float ground = m_caster->GetMapHeight(x, y, z); float liquidLevel = VMAP_INVALID_HEIGHT_VALUE; LiquidData liquidData; - if (m_caster->GetMap()->GetLiquidStatus(m_caster->GetPhaseShift(), x, y, z, map_liquidHeaderTypeFlags::AllLiquids, &liquidData, m_caster->GetCollisionHeight())) + if (m_caster->GetMap()->GetLiquidStatus(m_caster->GetPhaseShift(), x, y, z, {}, &liquidData, m_caster->GetCollisionHeight())) liquidLevel = liquidData.level; if (liquidLevel <= ground) // When there is no liquid Map::GetWaterOrGroundLevel returns ground level |