mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 07:37:01 +00:00
[7526] Use NULL for pointers instead 0
This commit is contained in:
parent
e09435326f
commit
fa098236af
4 changed files with 6 additions and 6 deletions
|
|
@ -14192,7 +14192,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
|
||||||
//Need to call it to initialize m_team (m_team can be calculated from m_race)
|
//Need to call it to initialize m_team (m_team can be calculated from m_race)
|
||||||
//Other way is to saves m_team into characters table.
|
//Other way is to saves m_team into characters table.
|
||||||
setFactionForRace(m_race);
|
setFactionForRace(m_race);
|
||||||
SetCharm(0);
|
SetCharm(NULL);
|
||||||
|
|
||||||
m_class = fields[5].GetUInt8();
|
m_class = fields[5].GetUInt8();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3090,7 +3090,7 @@ void Aura::HandleModPossess(bool apply, bool Real)
|
||||||
m_target->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE,cinfo->faction_A);
|
m_target->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE,cinfo->faction_A);
|
||||||
}
|
}
|
||||||
|
|
||||||
caster->SetCharm(0);
|
caster->SetCharm(NULL);
|
||||||
|
|
||||||
if(caster->GetTypeId() == TYPEID_PLAYER)
|
if(caster->GetTypeId() == TYPEID_PLAYER)
|
||||||
{
|
{
|
||||||
|
|
@ -3246,7 +3246,7 @@ void Aura::HandleModCharm(bool apply, bool Real)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
caster->SetCharm(0);
|
caster->SetCharm(NULL);
|
||||||
|
|
||||||
if(caster->GetTypeId() == TYPEID_PLAYER)
|
if(caster->GetTypeId() == TYPEID_PLAYER)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -7372,7 +7372,7 @@ Unit* Unit::GetCharm() const
|
||||||
return pet;
|
return pet;
|
||||||
|
|
||||||
sLog.outError("Unit::GetCharm: Charmed creature %u not exist.",GUID_LOPART(charm_guid));
|
sLog.outError("Unit::GetCharm: Charmed creature %u not exist.",GUID_LOPART(charm_guid));
|
||||||
const_cast<Unit*>(this)->SetCharm(0);
|
const_cast<Unit*>(this)->SetCharm(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "7525"
|
#define REVISION_NR "7526"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue