diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 747f0aa1330..945084e9655 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -7153,7 +7153,7 @@ GraveyardData const* ObjectMgr::FindGraveyardData(uint32 id, uint32 zoneId) cons return nullptr; } -AreaTrigger const* ObjectMgr::GetAreaTrigger(uint32 trigger) const +AreaTriggerTeleport const* ObjectMgr::GetAreaTrigger(uint32 trigger) const { AreaTriggerContainer::const_iterator itr = _areaTriggerStore.find(trigger); if (itr != _areaTriggerStore.end()) @@ -7268,14 +7268,6 @@ void ObjectMgr::LoadAreaTriggerTeleports() uint32 Trigger_ID = fields[0].GetUInt32(); - AreaTrigger at; - - at.target_mapId = fields[1].GetUInt16(); - at.target_X = fields[2].GetFloat(); - at.target_Y = fields[3].GetFloat(); - at.target_Z = fields[4].GetFloat(); - at.target_Orientation = fields[5].GetFloat(); - AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); if (!atEntry) { @@ -7283,6 +7275,14 @@ void ObjectMgr::LoadAreaTriggerTeleports() continue; } + AreaTriggerTeleport at; + + at.target_mapId = fields[1].GetUInt16(); + at.target_X = fields[2].GetFloat(); + at.target_Y = fields[3].GetFloat(); + at.target_Z = fields[4].GetFloat(); + at.target_Orientation = fields[5].GetFloat(); + MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId); if (!mapEntry) { @@ -7397,7 +7397,7 @@ void ObjectMgr::LoadAccessRequirements() /* * Searches for the areatrigger which teleports players out of the given map with instance_template.parent field support */ -AreaTrigger const* ObjectMgr::GetGoBackTrigger(uint32 Map) const +AreaTriggerTeleport const* ObjectMgr::GetGoBackTrigger(uint32 Map) const { bool useParentDbValue = false; uint32 parentId = 0; @@ -7430,7 +7430,7 @@ AreaTrigger const* ObjectMgr::GetGoBackTrigger(uint32 Map) const /** * Searches for the areatrigger which teleports players to the given map */ -AreaTrigger const* ObjectMgr::GetMapEntranceTrigger(uint32 Map) const +AreaTriggerTeleport const* ObjectMgr::GetMapEntranceTrigger(uint32 Map) const { for (AreaTriggerContainer::const_iterator itr = _areaTriggerStore.begin(); itr != _areaTriggerStore.end(); ++itr) { |