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

Core: Cleaning up hungarian notation - Phase7: pOwner -> owner

Browse Source
This commit is contained in:
click
2011-07-03 00:06:11 +02:00
parent db045c40ad
commit cc02a3fa79
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/scripts/Northrend/borean_tundra.cpp
View File

@@ -511,14 +511,14 @@ public:
if (who->GetEntry() == NPC_JENNY && me->IsWithinDistInMap(who, 10.0f))
{
if (Unit* pOwner = who->GetOwner())
if (Unit* owner = who->GetOwner())
{
if (pOwner->GetTypeId() == TYPEID_PLAYER)
if (owner->GetTypeId() == TYPEID_PLAYER)
{
if (who->HasAura(SPELL_CRATES_CARRIED))
{
pOwner->CastSpell(pOwner, SPELL_GIVE_JENNY_CREDIT, true); // Maybe is not working.
CAST_PLR(pOwner)->CompleteQuest(QUEST_LOADER_UP);
owner->CastSpell(owner, SPELL_GIVE_JENNY_CREDIT, true); // Maybe is not working.
CAST_PLR(owner)->CompleteQuest(QUEST_LOADER_UP);
CAST_CRE(who)->DisappearAndDie();
}
}
@@ -2175,9 +2175,9 @@ public:
{
if (Unit* uOwner = me->GetOwner())
{
Player* pOwner = uOwner->ToPlayer();
if (pOwner && pOwner->GetQuestStatus(QUEST_BURY_THOSE_COCKROACHES) == QUEST_STATUS_INCOMPLETE)
pOwner->KilledMonsterCredit(cCredit->GetEntry(), cCredit->GetGUID());
Player* owner = uOwner->ToPlayer();
if (owner && owner->GetQuestStatus(QUEST_BURY_THOSE_COCKROACHES) == QUEST_STATUS_INCOMPLETE)
owner->KilledMonsterCredit(cCredit->GetEntry(), cCredit->GetGUID());
}
}
}

4
src/server/scripts/Outland/hellfire_peninsula.cpp
View File

@@ -503,8 +503,8 @@ public:
pHelboar->RemoveCorpse();
DoCast(SPELL_SUMMON_POO);
if (Player* pOwner = me->GetCharmerOrOwnerPlayerOrPlayerItself())
me->GetMotionMaster()->MoveFollow(pOwner, 0.0f, 0.0f);
if (Player* owner = me->GetCharmerOrOwnerPlayerOrPlayerItself())
me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f);
}
}

6
src/server/scripts/World/npcs_special.cpp
View File

@@ -2103,11 +2103,11 @@ public:
void DamageTaken(Unit* /*killer*/, uint32 &damage)
{
if (me->isSummon())
if (Unit* pOwner = me->ToTempSummon()->GetSummoner())
if (Unit* owner = me->ToTempSummon()->GetSummoner())
{
if (pOwner->HasAura(GLYPH_OF_SHADOWFIEND))
if (owner->HasAura(GLYPH_OF_SHADOWFIEND))
if (damage >= me->GetHealth())
pOwner->CastSpell(pOwner, GLYPH_OF_SHADOWFIEND_MANA, true);
owner->CastSpell(owner, GLYPH_OF_SHADOWFIEND_MANA, true);
}
}