diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-07-23 19:13:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-07-23 19:13:33 +0200 |
| commit | 16a06346aea16ffd6ee84081cedfdb0c75ac0b38 (patch) | |
| tree | 61661f0914f1a19cc7f6a9bd04eabf9f8f6e846a /src/server/game/Entities | |
| parent | 82138bec18751eb889f364169cb53481eb90cdbd (diff) | |
Core/Maps: Move terrain data handling out of Map class
Partial port of cmangos/mangos-wotlk@ff5232c64809207b5fa59d62e9870f58a36b6f3f
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index d4c8b8aec40..52349b9f749 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -3375,7 +3375,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float // Unit is flying, check for potential collision via vmaps if (path.GetPathType() & PATHFIND_NOT_USING_PATH) { - col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(PhasingHandler::GetTerrainMapId(GetPhaseShift(), GetMap(), pos.m_positionX, pos.m_positionY), + col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(PhasingHandler::GetTerrainMapId(GetPhaseShift(), GetMap()->GetTerrain(), pos.m_positionX, pos.m_positionY), pos.m_positionX, pos.m_positionY, pos.m_positionZ + halfHeight, destx, desty, destz + halfHeight, destx, desty, destz, -0.5f); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6d428abf54e..4bc63a2c304 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -114,6 +114,7 @@ #include "SpellPackets.h" #include "StringConvert.h" #include "TalentPackets.h" +#include "TerrainMgr.h" #include "ToyPackets.h" #include "TradeData.h" #include "Transport.h" @@ -7182,7 +7183,7 @@ uint32 Player::GetZoneIdFromDB(ObjectGuid guid) if (!sMapStore.LookupEntry(map)) return 0; - zone = sMapMgr->GetZoneId(PhasingHandler::GetEmptyPhaseShift(), map, posx, posy, posz); + zone = sTerrainMgr.GetZoneId(PhasingHandler::GetEmptyPhaseShift(), map, posx, posy, posz); if (zone > 0) { @@ -19759,7 +19760,7 @@ bool Player::_LoadHomeBind(PreparedQueryResult result) if (!createPosition.TransportGuid) { m_homebind.WorldRelocate(createPosition.Loc); - m_homebindAreaId = sMapMgr->GetAreaId(PhasingHandler::GetEmptyPhaseShift(), m_homebind); + m_homebindAreaId = sTerrainMgr.GetAreaId(PhasingHandler::GetEmptyPhaseShift(), m_homebind); saveHomebindToDb(); ok = true; @@ -19775,7 +19776,7 @@ bool Player::_LoadHomeBind(PreparedQueryResult result) ASSERT(loc, "Missing fallback graveyard location for faction %u", uint32(GetTeamId())); m_homebind.WorldRelocate(loc->Loc); - m_homebindAreaId = sMapMgr->GetAreaId(PhasingHandler::GetEmptyPhaseShift(), loc->Loc); + m_homebindAreaId = sTerrainMgr.GetAreaId(PhasingHandler::GetEmptyPhaseShift(), loc->Loc); saveHomebindToDb(); } |