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
@@ -82,7 +82,7 @@ Group* GroupMgr::GetGroupByDbStoreId(uint32 storageId) const
|
||||
return NULL;
|
||||
}
|
||||
|
||||
uint32 GroupMgr::GenerateGroupId()
|
||||
ObjectGuid::LowType GroupMgr::GenerateGroupId()
|
||||
{
|
||||
if (NextGroupId >= 0xFFFFFFFE)
|
||||
{
|
||||
@@ -92,7 +92,7 @@ uint32 GroupMgr::GenerateGroupId()
|
||||
return NextGroupId++;
|
||||
}
|
||||
|
||||
Group* GroupMgr::GetGroupByGUID(uint32 groupId) const
|
||||
Group* GroupMgr::GetGroupByGUID(ObjectGuid::LowType groupId) const
|
||||
{
|
||||
GroupContainer::const_iterator itr = GroupStore.find(groupId);
|
||||
if (itr != GroupStore.end())
|
||||
|
||||
Reference in new issue
Block a user