Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature
This commit is contained in:
1 parent
3ddc1cc4c4
commit
f91ee24184
345 files changed
+3642
-3642
No files matched your search
@@ -44,7 +44,7 @@ class npc_blood_knight_dawnstar : public CreatureScript
|
||||
public:
|
||||
npc_blood_knight_dawnstar() : CreatureScript("npc_blood_knight_dawnstar") { }
|
||||
|
||||
bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction)
|
||||
bool OnGossipSelect(Player* pPlayer, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction)
|
||||
{
|
||||
pPlayer->PlayerTalkClass->ClearMenus();
|
||||
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
|
||||
@@ -60,12 +60,12 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
|
||||
bool OnGossipHello(Player* pPlayer, Creature* creature)
|
||||
{
|
||||
if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226, 1, true))
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
|
||||
|
||||
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -83,26 +83,26 @@ class npc_budd_nedreck : public CreatureScript
|
||||
public:
|
||||
npc_budd_nedreck() : CreatureScript("npc_budd_nedreck") { }
|
||||
|
||||
bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
|
||||
bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
|
||||
{
|
||||
pPlayer->PlayerTalkClass->ClearMenus();
|
||||
if (uiAction == GOSSIP_ACTION_INFO_DEF)
|
||||
{
|
||||
pPlayer->CLOSE_GOSSIP_MENU();
|
||||
pCreature->CastSpell(pPlayer, 42540, false);
|
||||
creature->CastSpell(pPlayer, 42540, false);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
|
||||
bool OnGossipHello(Player* pPlayer, Creature* creature)
|
||||
{
|
||||
if (pCreature->isQuestGiver())
|
||||
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
|
||||
if (creature->isQuestGiver())
|
||||
pPlayer->PrepareQuestMenu(creature->GetGUID());
|
||||
|
||||
if (pPlayer->GetQuestStatus(11166) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
|
||||
|
||||
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -117,25 +117,25 @@ class npc_rathis_tomber : public CreatureScript
|
||||
public:
|
||||
npc_rathis_tomber() : CreatureScript("npc_rathis_tomber") { }
|
||||
|
||||
bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
|
||||
bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
|
||||
{
|
||||
pPlayer->PlayerTalkClass->ClearMenus();
|
||||
if (uiAction == GOSSIP_ACTION_TRADE)
|
||||
pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
|
||||
pPlayer->GetSession()->SendListInventory(creature->GetGUID());
|
||||
return true;
|
||||
}
|
||||
|
||||
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
|
||||
bool OnGossipHello(Player* pPlayer, Creature* creature)
|
||||
{
|
||||
if (pCreature->isQuestGiver())
|
||||
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
|
||||
if (creature->isQuestGiver())
|
||||
pPlayer->PrepareQuestMenu(creature->GetGUID());
|
||||
|
||||
if (pCreature->isVendor() && pPlayer->GetQuestRewardStatus(9152))
|
||||
if (creature->isVendor() && pPlayer->GetQuestRewardStatus(9152))
|
||||
{
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
|
||||
pPlayer->SEND_GOSSIP_MENU(8432, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(8432, creature->GetGUID());
|
||||
}else
|
||||
pPlayer->SEND_GOSSIP_MENU(8431, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(8431, creature->GetGUID());
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -234,21 +234,21 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest)
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest)
|
||||
{
|
||||
if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS)
|
||||
{
|
||||
pCreature->setFaction(113);
|
||||
creature->setFaction(113);
|
||||
|
||||
if (npc_escortAI* pEscortAI = CAST_AI(npc_ranger_lilatha::npc_ranger_lilathaAI, pCreature->AI()))
|
||||
if (npc_escortAI* pEscortAI = CAST_AI(npc_ranger_lilatha::npc_ranger_lilathaAI, creature->AI()))
|
||||
pEscortAI->Start(true, false, pPlayer->GetGUID());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
{
|
||||
return new npc_ranger_lilathaAI(pCreature);
|
||||
return new npc_ranger_lilathaAI(creature);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user