diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-29 21:13:21 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-10-03 18:12:05 +0200 |
| commit | f9fd80251c2e82fc46f822c1d65d57828bf0b690 (patch) | |
| tree | 887b4e046b17234b7d3c5a5e4960c9fdb2349fe6 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 1a67fea2c415ef0bca464f102624ef754d6bad19 (diff) | |
Core/Entites: ObjectGuid construction refactor
(cherry picked from commit 15fbb6f46fb24fdc6f91786543b32f247e6525fc)
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 6fa4f1788d9..089c3cdf05d 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1892,8 +1892,8 @@ void ObjectMgr::LoadLinkedRespawn() break; } - guid = ObjectGuid(HighGuid::Unit, slave->id, guidLow); - linkedGuid = ObjectGuid(HighGuid::Unit, master->id, linkedGuidLow); + guid = ObjectGuid::Create<HighGuid::Unit>(slave->id, guidLow); + linkedGuid = ObjectGuid::Create<HighGuid::Unit>(master->id, linkedGuidLow); break; } case LINKED_RESPAWN_CREATURE_TO_GO: @@ -1929,8 +1929,8 @@ void ObjectMgr::LoadLinkedRespawn() break; } - guid = ObjectGuid(HighGuid::Unit, slave->id, guidLow); - linkedGuid = ObjectGuid(HighGuid::GameObject, master->id, linkedGuidLow); + guid = ObjectGuid::Create<HighGuid::Unit>(slave->id, guidLow); + linkedGuid = ObjectGuid::Create<HighGuid::GameObject>(master->id, linkedGuidLow); break; } case LINKED_RESPAWN_GO_TO_GO: @@ -1966,8 +1966,8 @@ void ObjectMgr::LoadLinkedRespawn() break; } - guid = ObjectGuid(HighGuid::GameObject, slave->id, guidLow); - linkedGuid = ObjectGuid(HighGuid::GameObject, master->id, linkedGuidLow); + guid = ObjectGuid::Create<HighGuid::GameObject>(slave->id, guidLow); + linkedGuid = ObjectGuid::Create<HighGuid::GameObject>(master->id, linkedGuidLow); break; } case LINKED_RESPAWN_GO_TO_CREATURE: @@ -2003,8 +2003,8 @@ void ObjectMgr::LoadLinkedRespawn() break; } - guid = ObjectGuid(HighGuid::GameObject, slave->id, guidLow); - linkedGuid = ObjectGuid(HighGuid::Unit, master->id, linkedGuidLow); + guid = ObjectGuid::Create<HighGuid::GameObject>(slave->id, guidLow); + linkedGuid = ObjectGuid::Create<HighGuid::Unit>(master->id, linkedGuidLow); break; } } @@ -2024,7 +2024,7 @@ bool ObjectMgr::SetCreatureLinkedRespawn(ObjectGuid::LowType guidLow, ObjectGuid CreatureData const* master = GetCreatureData(guidLow); ASSERT(master); - ObjectGuid guid(HighGuid::Unit, master->id, guidLow); + ObjectGuid guid = ObjectGuid::Create<HighGuid::Unit>(master->id, guidLow); if (!linkedGuidLow) // we're removing the linking { @@ -2056,7 +2056,7 @@ bool ObjectMgr::SetCreatureLinkedRespawn(ObjectGuid::LowType guidLow, ObjectGuid return false; } - ObjectGuid linkedGuid(HighGuid::Unit, slave->id, linkedGuidLow); + ObjectGuid linkedGuid = ObjectGuid::Create<HighGuid::Unit>(slave->id, linkedGuidLow); _linkedRespawnStore[guid] = linkedGuid; WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_REP_LINKED_RESPAWN); @@ -6443,7 +6443,7 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) { Field* fields = result->Fetch(); ObjectGuid::LowType receiver = fields[3].GetUInt32(); - if (serverUp && ObjectAccessor::FindConnectedPlayer(ObjectGuid(HighGuid::Player, receiver))) + if (serverUp && ObjectAccessor::FindConnectedPlayer(ObjectGuid::Create<HighGuid::Player>(receiver))) continue; Mail* m = new Mail; |