Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
(cherry picked from commit b1032ed620)
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Mails/Mail.h
src/server/game/Maps/Map.cpp
src/server/game/Maps/TransportMgr.cpp
src/server/game/Maps/TransportMgr.h
src/server/game/OutdoorPvP/OutdoorPvP.h
This commit is contained in:
1 parent
b20c9ae283
commit
6664a3acc3
81 files changed
+415
-415
No files matched your search
@@ -91,7 +91,7 @@ Group::~Group()
|
||||
bool Group::Create(Player* leader)
|
||||
{
|
||||
ObjectGuid leaderGuid = leader->GetGUID();
|
||||
uint32 lowguid = sGroupMgr->GenerateGroupId();
|
||||
ObjectGuid::LowType lowguid = sGroupMgr->GenerateGroupId();
|
||||
|
||||
m_guid = ObjectGuid(HighGuid::Group, lowguid);
|
||||
m_leaderGuid = leaderGuid;
|
||||
@@ -198,7 +198,7 @@ void Group::LoadGroupFromDB(Field* fields)
|
||||
sLFGMgr->_LoadFromDB(fields, GetGUID());
|
||||
}
|
||||
|
||||
void Group::LoadMemberFromDB(uint32 guidLow, uint8 memberFlags, uint8 subgroup, uint8 roles)
|
||||
void Group::LoadMemberFromDB(ObjectGuid::LowType guidLow, uint8 memberFlags, uint8 subgroup, uint8 roles)
|
||||
{
|
||||
MemberSlot member;
|
||||
member.guid = ObjectGuid(HighGuid::Player, guidLow);
|
||||
@@ -2268,7 +2268,7 @@ ObjectGuid Group::GetGUID() const
|
||||
return m_guid;
|
||||
}
|
||||
|
||||
uint32 Group::GetLowGUID() const
|
||||
ObjectGuid::LowType Group::GetLowGUID() const
|
||||
{
|
||||
return m_guid.GetCounter();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user