josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature

Browse Source
This commit is contained in:
click
2011-07-02 22:18:03 +02:00
parent 3ddc1cc4c4
commit f91ee24184
345 changed files with 3642 additions and 3642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+28 -28
View File
@@ -49,43 +49,43 @@ class npcs_dithers_and_arbington : public CreatureScript
public:
npcs_dithers_and_arbington() : CreatureScript("npcs_dithers_and_arbington") { }
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_TRADE:
pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
pPlayer->GetSession()->SendListInventory(creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(3980, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(3980, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(3981, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(3981, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(3982, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(3982, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(3983, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(3983, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->CLOSE_GOSSIP_MENU();
pCreature->CastSpell(pPlayer, 17529, false);
creature->CastSpell(pPlayer, 17529, false);
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
bool OnGossipHello(Player* pPlayer, Creature* creature)
{
if (pCreature->isQuestGiver())
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pCreature->isVendor())
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (pPlayer->GetQuestRewardStatus(5237) || pPlayer->GetQuestRewardStatus(5238))
@@ -94,9 +94,9 @@ public:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(3985, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(3985, creature->GetGUID());
}else
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
return true;
}
@@ -121,7 +121,7 @@ class npc_myranda_the_hag : public CreatureScript
public:
npc_myranda_the_hag() : CreatureScript("npc_myranda_the_hag") { }
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)
@@ -132,20 +132,20 @@ 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(QUEST_SUBTERFUGE) == QUEST_STATUS_COMPLETE &&
!pPlayer->GetQuestRewardStatus(QUEST_IN_DREAMS) && !pPlayer->HasAura(SPELL_SCARLET_ILLUSION))
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ILLUSION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(4773, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(4773, creature->GetGUID());
return true;
}
else
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
return true;
}
@@ -161,9 +161,9 @@ class npc_the_scourge_cauldron : public CreatureScript
public:
npc_the_scourge_cauldron() : CreatureScript("npc_the_scourge_cauldron") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new npc_the_scourge_cauldronAI (pCreature);
return new npc_the_scourge_cauldronAI (creature);
}
struct npc_the_scourge_cauldronAI : public ScriptedAI
@@ -246,9 +246,9 @@ class npc_andorhal_tower : public CreatureScript
public:
npc_andorhal_tower() : CreatureScript("npc_andorhal_tower") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new npc_andorhal_towerAI (pCreature);
return new npc_andorhal_towerAI (creature);
}
struct npc_andorhal_towerAI : public Scripted_NoMovementAI
@@ -293,23 +293,23 @@ class npc_anchorite_truuen : public CreatureScript
public:
npc_anchorite_truuen() : CreatureScript("npc_anchorite_truuen") { }
bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const *quest)
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest)
{
npc_escortAI* pEscortAI = CAST_AI(npc_anchorite_truuen::npc_anchorite_truuenAI, pCreature->AI());
npc_escortAI* pEscortAI = CAST_AI(npc_anchorite_truuen::npc_anchorite_truuenAI, creature->AI());
if (quest->GetQuestId() == QUEST_TOMB_LIGHTBRINGER)
pEscortAI->Start(true, true, pPlayer->GetGUID());
return false;
}
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new npc_anchorite_truuenAI(pCreature);
return new npc_anchorite_truuenAI(creature);
}
struct npc_anchorite_truuenAI : public npc_escortAI
{
npc_anchorite_truuenAI(Creature* pCreature) : npc_escortAI(pCreature) { }
npc_anchorite_truuenAI(Creature* creature) : npc_escortAI(creature) { }
uint32 m_uiChatTimer;