Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change many uint32 to ObjectGuid::LowType in line with 6.x changes.

Browse Source 
(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:
pete318
2015-10-11 00:17:46 +01:00
committed by ariel-
parent b20c9ae283
commit 6664a3acc3
81 changed files with 415 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Maps/Map.cpp
View File

@@ -3403,7 +3403,7 @@ void Map::UpdateIteratorBack(Player* player)
m_mapRefIter = m_mapRefIter->nocheck_prev();
}
void Map::SaveCreatureRespawnTime(uint32 dbGuid, time_t respawnTime)
void Map::SaveCreatureRespawnTime(ObjectGuid::LowType dbGuid, time_t respawnTime)
{
if (!respawnTime)
{
@@ -3422,7 +3422,7 @@ void Map::SaveCreatureRespawnTime(uint32 dbGuid, time_t respawnTime)
CharacterDatabase.Execute(stmt);
}
void Map::RemoveCreatureRespawnTime(uint32 dbGuid)
void Map::RemoveCreatureRespawnTime(ObjectGuid::LowType dbGuid)
{
_creatureRespawnTimes.erase(dbGuid);
@@ -3433,7 +3433,7 @@ void Map::RemoveCreatureRespawnTime(uint32 dbGuid)
CharacterDatabase.Execute(stmt);
}
void Map::SaveGORespawnTime(uint32 dbGuid, time_t respawnTime)
void Map::SaveGORespawnTime(ObjectGuid::LowType dbGuid, time_t respawnTime)
{
if (!respawnTime)
{
@@ -3452,7 +3452,7 @@ void Map::SaveGORespawnTime(uint32 dbGuid, time_t respawnTime)
CharacterDatabase.Execute(stmt);
}
void Map::RemoveGORespawnTime(uint32 dbGuid)
void Map::RemoveGORespawnTime(ObjectGuid::LowType dbGuid)
{
_goRespawnTimes.erase(dbGuid);
@@ -3473,7 +3473,7 @@ void Map::LoadRespawnTimes()
do
{
Field* fields = result->Fetch();
uint32 loguid = fields[0].GetUInt32();
ObjectGuid::LowType loguid = fields[0].GetUInt32();
uint32 respawnTime = fields[1].GetUInt32();
_creatureRespawnTimes[loguid] = time_t(respawnTime);
@@ -3488,7 +3488,7 @@ void Map::LoadRespawnTimes()
do
{
Field* fields = result->Fetch();
uint32 loguid = fields[0].GetUInt32();
ObjectGuid::LowType loguid = fields[0].GetUInt32();
uint32 respawnTime = fields[1].GetUInt32();
_goRespawnTimes[loguid] = time_t(respawnTime);