mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10671] Convert some Unit owner/etc guids to ObjectGuid way.

Browse source
This commit is contained in:
VladimirMangos 2010-11-01 12:11:23 +03:00
parent 92d98b9fb2
commit a32d68febd
18 changed files with 154 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Creature.cpp
View file

@ -595,7 +595,7 @@ void Creature::RegenerateMana()
uint32 addvalue = 0;
// Combat and any controlled creature
if (isInCombat() || GetCharmerOrOwnerGUID())
if (isInCombat() || !GetCharmerOrOwnerGuid().IsEmpty())
{
if(!IsUnderLastManaUseEffect())
{
@ -625,7 +625,7 @@ void Creature::RegenerateHealth()
uint32 addvalue = 0;
// Not only pet, but any controlled creature
if(GetCharmerOrOwnerGUID())
if (!GetCharmerOrOwnerGuid().IsEmpty())
{
float HealthIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_HEALTH);
float Spirit = GetStat(STAT_SPIRIT);
@ -1734,7 +1734,7 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /
return false;
// only free creature
if (GetCharmerOrOwnerGUID())
if (!GetCharmerOrOwnerGuid().IsEmpty())
return false;
// only from same creature faction