Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature
This commit is contained in:
@@ -54,7 +54,7 @@ class npc_bunthen_plainswind : public CreatureScript
|
||||
public:
|
||||
npc_bunthen_plainswind() : CreatureScript("npc_bunthen_plainswind") { }
|
||||
|
||||
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)
|
||||
@@ -65,25 +65,25 @@ public:
|
||||
pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE);
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 2:
|
||||
pPlayer->SEND_GOSSIP_MENU(5373, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(5373, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
pPlayer->SEND_GOSSIP_MENU(5376, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(5376, creature->GetGUID());
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
|
||||
bool OnGossipHello(Player* pPlayer, Creature* creature)
|
||||
{
|
||||
if (pPlayer->getClass() != CLASS_DRUID)
|
||||
pPlayer->SEND_GOSSIP_MENU(4916, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4916, creature->GetGUID());
|
||||
else if (pPlayer->GetTeam() != HORDE)
|
||||
{
|
||||
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
|
||||
|
||||
pPlayer->SEND_GOSSIP_MENU(4917, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4917, creature->GetGUID());
|
||||
}
|
||||
else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == HORDE)
|
||||
{
|
||||
@@ -92,7 +92,7 @@ public:
|
||||
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
|
||||
pPlayer->SEND_GOSSIP_MENU(4918, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4918, creature->GetGUID());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -113,25 +113,25 @@ class npc_great_bear_spirit : public CreatureScript
|
||||
public:
|
||||
npc_great_bear_spirit() : CreatureScript("npc_great_bear_spirit") { }
|
||||
|
||||
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_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
|
||||
pPlayer->SEND_GOSSIP_MENU(4721, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4721, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 1:
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
|
||||
pPlayer->SEND_GOSSIP_MENU(4733, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4733, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 2:
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
pPlayer->SEND_GOSSIP_MENU(4734, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4734, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
pPlayer->SEND_GOSSIP_MENU(4735, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4735, creature->GetGUID());
|
||||
if (pPlayer->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->AreaExploredOrEventHappens(5929);
|
||||
if (pPlayer->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
|
||||
@@ -141,16 +141,16 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
|
||||
bool OnGossipHello(Player* pPlayer, Creature* creature)
|
||||
{
|
||||
//ally or horde quest
|
||||
if (pPlayer->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
|
||||
{
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
|
||||
pPlayer->SEND_GOSSIP_MENU(4719, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4719, creature->GetGUID());
|
||||
}
|
||||
else
|
||||
pPlayer->SEND_GOSSIP_MENU(4718, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4718, creature->GetGUID());
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -169,7 +169,7 @@ class npc_silva_filnaveth : public CreatureScript
|
||||
public:
|
||||
npc_silva_filnaveth() : CreatureScript("npc_silva_filnaveth") { }
|
||||
|
||||
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)
|
||||
@@ -180,25 +180,25 @@ public:
|
||||
pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY);
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 2:
|
||||
pPlayer->SEND_GOSSIP_MENU(5374, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(5374, creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
pPlayer->SEND_GOSSIP_MENU(5375, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(5375, creature->GetGUID());
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
|
||||
bool OnGossipHello(Player* pPlayer, Creature* creature)
|
||||
{
|
||||
if (pPlayer->getClass() != CLASS_DRUID)
|
||||
pPlayer->SEND_GOSSIP_MENU(4913, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4913, creature->GetGUID());
|
||||
else if (pPlayer->GetTeam() != ALLIANCE)
|
||||
{
|
||||
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
|
||||
|
||||
pPlayer->SEND_GOSSIP_MENU(4915, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4915, creature->GetGUID());
|
||||
}
|
||||
else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == ALLIANCE)
|
||||
{
|
||||
@@ -207,7 +207,7 @@ public:
|
||||
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
|
||||
pPlayer->SEND_GOSSIP_MENU(4914, pCreature->GetGUID());
|
||||
pPlayer->SEND_GOSSIP_MENU(4914, creature->GetGUID());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -288,9 +288,9 @@ class npc_clintar_spirit : public CreatureScript
|
||||
public:
|
||||
npc_clintar_spirit() : CreatureScript("npc_clintar_spirit") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* pCreature) const
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
{
|
||||
return new npc_clintar_spiritAI (pCreature);
|
||||
return new npc_clintar_spiritAI (creature);
|
||||
}
|
||||
|
||||
struct npc_clintar_spiritAI : public npc_escortAI
|
||||
@@ -559,11 +559,11 @@ class npc_clintar_dreamwalker : public CreatureScript
|
||||
public:
|
||||
npc_clintar_dreamwalker() : CreatureScript("npc_clintar_dreamwalker") { }
|
||||
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const *quest)
|
||||
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest)
|
||||
{
|
||||
if (quest->GetQuestId() == 10965)
|
||||
{
|
||||
Creature* clintar_spirit = pCreature->SummonCreature(CLINTAR_SPIRIT, CLINTAR_SPIRIT_SUMMON_X, CLINTAR_SPIRIT_SUMMON_Y, CLINTAR_SPIRIT_SUMMON_Z, CLINTAR_SPIRIT_SUMMON_O, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000);
|
||||
Creature* clintar_spirit = creature->SummonCreature(CLINTAR_SPIRIT, CLINTAR_SPIRIT_SUMMON_X, CLINTAR_SPIRIT_SUMMON_Y, CLINTAR_SPIRIT_SUMMON_Z, CLINTAR_SPIRIT_SUMMON_O, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000);
|
||||
if (clintar_spirit)
|
||||
CAST_AI(npc_clintar_spirit::npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(pPlayer);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user