Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature
This commit is contained in:
@@ -51,9 +51,9 @@ class mob_aquementas : public CreatureScript
|
||||
public:
|
||||
mob_aquementas() : CreatureScript("mob_aquementas") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
{
|
||||
return new mob_aquementasAI (pCreature);
|
||||
return new mob_aquementasAI (creature);
|
||||
}
|
||||
|
||||
struct mob_aquementasAI : public ScriptedAI
|
||||
@@ -163,9 +163,9 @@ class npc_custodian_of_time : public CreatureScript
|
||||
public:
|
||||
npc_custodian_of_time() : CreatureScript("npc_custodian_of_time") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
{
|
||||
return new npc_custodian_of_timeAI(pCreature);
|
||||
return new npc_custodian_of_timeAI(creature);
|
||||
}
|
||||
|
||||
struct npc_custodian_of_timeAI : public npc_escortAI
|
||||
@@ -244,24 +244,24 @@ class npc_marin_noggenfogger : public CreatureScript
|
||||
public:
|
||||
npc_marin_noggenfogger() : CreatureScript("npc_marin_noggenfogger") { }
|
||||
|
||||
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(2662))
|
||||
if (creature->isVendor() && pPlayer->GetQuestRewardStatus(2662))
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
|
||||
|
||||
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -279,7 +279,7 @@ class npc_steward_of_time : public CreatureScript
|
||||
public:
|
||||
npc_steward_of_time() : CreatureScript("npc_steward_of_time") { }
|
||||
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const *quest)
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* /*creature*/, Quest const *quest)
|
||||
{
|
||||
if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair
|
||||
pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns)
|
||||
@@ -287,7 +287,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
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)
|
||||
@@ -296,18 +296,18 @@ public:
|
||||
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(10279) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestRewardStatus(10279))
|
||||
{
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
|
||||
pPlayer->SEND_GOSSIP_MENU(9978, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(9978, creature->GetGUID());
|
||||
}
|
||||
else
|
||||
pPlayer->SEND_GOSSIP_MENU(9977, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(9977, creature->GetGUID());
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -330,30 +330,30 @@ class npc_stone_watcher_of_norgannon : public CreatureScript
|
||||
public:
|
||||
npc_stone_watcher_of_norgannon() : CreatureScript("npc_stone_watcher_of_norgannon") { }
|
||||
|
||||
bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
|
||||
bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
|
||||
{
|
||||
pPlayer->PlayerTalkClass->ClearMenus();
|
||||
switch (uiAction)
|
||||
{
|
||||
case GOSSIP_ACTION_INFO_DEF:
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
|
||||
pPlayer->SEND_GOSSIP_MENU(1675, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(1675, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF+1:
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
|
||||
pPlayer->SEND_GOSSIP_MENU(1676, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(1676, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF+2:
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
|
||||
pPlayer->SEND_GOSSIP_MENU(1677, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(1677, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF+3:
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
|
||||
pPlayer->SEND_GOSSIP_MENU(1678, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(1678, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF+4:
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
|
||||
pPlayer->SEND_GOSSIP_MENU(1679, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(1679, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF+5:
|
||||
pPlayer->CLOSE_GOSSIP_MENU();
|
||||
@@ -363,15 +363,15 @@ public:
|
||||
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(2954) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
|
||||
|
||||
pPlayer->SEND_GOSSIP_MENU(1674, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(1674, creature->GetGUID());
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -403,25 +403,25 @@ class npc_OOX17 : public CreatureScript
|
||||
public:
|
||||
npc_OOX17() : CreatureScript("npc_OOX17") { }
|
||||
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest)
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest)
|
||||
{
|
||||
if (quest->GetQuestId() == Q_OOX17)
|
||||
{
|
||||
pCreature->setFaction(113);
|
||||
pCreature->SetFullHealth();
|
||||
pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
|
||||
pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
DoScriptText(SAY_OOX_START, pCreature);
|
||||
creature->setFaction(113);
|
||||
creature->SetFullHealth();
|
||||
creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
|
||||
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
DoScriptText(SAY_OOX_START, creature);
|
||||
|
||||
if (npc_escortAI* pEscortAI = CAST_AI(npc_OOX17::npc_OOX17AI, pCreature->AI()))
|
||||
if (npc_escortAI* pEscortAI = CAST_AI(npc_OOX17::npc_OOX17AI, creature->AI()))
|
||||
pEscortAI->Start(true, false, pPlayer->GetGUID());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
{
|
||||
return new npc_OOX17AI(pCreature);
|
||||
return new npc_OOX17AI(creature);
|
||||
}
|
||||
|
||||
struct npc_OOX17AI : public npc_escortAI
|
||||
@@ -506,25 +506,25 @@ class npc_tooga : public CreatureScript
|
||||
public:
|
||||
npc_tooga() : CreatureScript("npc_tooga") { }
|
||||
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest)
|
||||
{
|
||||
if (pQuest->GetQuestId() == QUEST_TOOGA)
|
||||
{
|
||||
if (npc_toogaAI* pToogaAI = CAST_AI(npc_tooga::npc_toogaAI, pCreature->AI()))
|
||||
if (npc_toogaAI* pToogaAI = CAST_AI(npc_tooga::npc_toogaAI, creature->AI()))
|
||||
pToogaAI->StartFollow(pPlayer, FACTION_TOOG_ESCORTEE, pQuest);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
{
|
||||
return new npc_toogaAI(pCreature);
|
||||
return new npc_toogaAI(creature);
|
||||
}
|
||||
|
||||
struct npc_toogaAI : public FollowerAI
|
||||
{
|
||||
npc_toogaAI(Creature* pCreature) : FollowerAI(pCreature) { }
|
||||
npc_toogaAI(Creature* creature) : FollowerAI(creature) { }
|
||||
|
||||
uint32 m_uiCheckSpeechTimer;
|
||||
uint32 m_uiPostEventTimer;
|
||||
|
||||
Reference in New Issue
Block a user