aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.cpp2
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp22
-rw-r--r--src/server/game/Globals/ObjectMgr.h10
-rw-r--r--src/server/game/Groups/Group.cpp2
-rw-r--r--src/server/game/Handlers/CharacterHandler.cpp2
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp2
-rw-r--r--src/server/scripts/Commands/cs_go.cpp4
8 files changed, 23 insertions, 23 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 69a78c2f53e..8b68e951a64 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -263,7 +263,7 @@ void LFGMgr::LoadLFGDungeons(bool reload /* = false */)
// No teleport coords in database, load from areatriggers
if (dungeon.type != LFG_TYPE_RANDOM && dungeon.x == 0.0f && dungeon.y == 0.0f && dungeon.z == 0.0f)
{
- AreaTrigger const* at = sObjectMgr->GetMapEntranceTrigger(dungeon.map);
+ AreaTriggerTeleport const* at = sObjectMgr->GetMapEntranceTrigger(dungeon.map);
if (!at)
{
TC_LOG_ERROR("sql.sql", "Failed to load dungeon {}, cant find areatrigger for map {}", dungeon.name, dungeon.map);
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 0d50aadd992..35269d079e4 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -17384,7 +17384,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder const& hol
// load the player's map here if it's not already loaded
if (!map)
map = sMapMgr->CreateMap(mapId, this, instanceId);
- AreaTrigger const* areaTrigger = nullptr;
+ AreaTriggerTeleport const* areaTrigger = nullptr;
bool check = false;
if (!map)
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)
{
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index e13ef16db80..3869bca4a18 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -449,7 +449,7 @@ struct TC_GAME_API SpellClickInfo
typedef std::multimap<uint32, SpellClickInfo> SpellClickInfoContainer;
-struct AreaTrigger
+struct AreaTriggerTeleport
{
uint32 target_mapId;
float target_X;
@@ -948,7 +948,7 @@ class TC_GAME_API ObjectMgr
typedef std::unordered_map<uint32, Trinity::unique_trackable_ptr<Quest>> QuestContainer;
- typedef std::unordered_map<uint32, AreaTrigger> AreaTriggerContainer;
+ typedef std::unordered_map<uint32, AreaTriggerTeleport> AreaTriggerContainer;
typedef std::map<uint32, uint32> AreaTriggerScriptContainer;
@@ -1065,10 +1065,10 @@ class TC_GAME_API ObjectMgr
void LoadGraveyardZones();
GraveyardData const* FindGraveyardData(uint32 id, uint32 zone) const;
- AreaTrigger const* GetAreaTrigger(uint32 trigger) const;
+ AreaTriggerTeleport const* GetAreaTrigger(uint32 trigger) const;
AccessRequirement const* GetAccessRequirement(uint32 mapid, Difficulty difficulty) const;
- AreaTrigger const* GetGoBackTrigger(uint32 Map) const;
- AreaTrigger const* GetMapEntranceTrigger(uint32 Map) const;
+ AreaTriggerTeleport const* GetGoBackTrigger(uint32 Map) const;
+ AreaTriggerTeleport const* GetMapEntranceTrigger(uint32 Map) const;
uint32 GetAreaTriggerScriptId(uint32 trigger_id) const;
SpellScriptsBounds GetSpellScriptsBounds(uint32 spellId);
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 3a810588522..325e8c17e1a 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -2235,7 +2235,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo)
{
if (map && map->IsDungeon() && SendMsgTo)
{
- AreaTrigger const * const instanceEntrance = sObjectMgr->GetGoBackTrigger(map->GetId());
+ AreaTriggerTeleport const * const instanceEntrance = sObjectMgr->GetGoBackTrigger(map->GetId());
if (!instanceEntrance)
TC_LOG_DEBUG("root", "Instance entrance not found for maps {}", map->GetId());
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index bd916a61f86..6af3f8901fb 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -823,7 +823,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder const& holder)
if (!pCurrChar->GetMap()->AddPlayerToMap(pCurrChar))
{
- AreaTrigger const* at = sObjectMgr->GetGoBackTrigger(pCurrChar->GetMapId());
+ AreaTriggerTeleport const* at = sObjectMgr->GetGoBackTrigger(pCurrChar->GetMapId());
if (at)
pCurrChar->TeleportTo(at->target_mapId, at->target_X, at->target_Y, at->target_Z, pCurrChar->GetOrientation());
else
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 030dc0ab823..4653ff5038d 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -672,7 +672,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recvData)
if (pvp->HandleAreaTrigger(_player, triggerId))
return;
- AreaTrigger const* at = sObjectMgr->GetAreaTrigger(triggerId);
+ AreaTriggerTeleport const* at = sObjectMgr->GetAreaTrigger(triggerId);
if (!at)
return;
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index 22cf5b2e360..0f91e908c5f 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -413,7 +413,7 @@ public:
player->SaveRecallPosition();
// try going to entrance
- if (AreaTrigger const* exit = sObjectMgr->GetGoBackTrigger(mapId))
+ if (AreaTriggerTeleport const* exit = sObjectMgr->GetGoBackTrigger(mapId))
{
if (player->TeleportTo(exit->target_mapId, exit->target_X, exit->target_Y, exit->target_Z, exit->target_Orientation + M_PI))
{
@@ -431,7 +431,7 @@ public:
handler->PSendSysMessage(LANG_COMMAND_INSTANCE_NO_EXIT, mapName, mapId);
// try going to start
- if (AreaTrigger const* entrance = sObjectMgr->GetMapEntranceTrigger(mapId))
+ if (AreaTriggerTeleport const* entrance = sObjectMgr->GetMapEntranceTrigger(mapId))
{
if (player->TeleportTo(entrance->target_mapId, entrance->target_X, entrance->target_Y, entrance->target_Z, entrance->target_Orientation))
{