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

This commit is contained in:
click committed 2011-07-02 22:18:03 +02:00
1 parent 3ddc1cc4c4
commit f91ee24184
345 files changed
+3642 -3642

No files matched your search

@@ -45,24 +45,24 @@ class npc_deathly_usher : public CreatureScript
public:
npc_deathly_usher() : CreatureScript("npc_deathly_usher") { }
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, SPELL_TELEPORT_SINGLE, true);
creature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
bool OnGossipHello(Player* pPlayer, Creature* creature)
{
if (pPlayer->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(10757, 1))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, 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;
}
@@ -88,49 +88,49 @@ class npc_fallen_hero_of_horde : public CreatureScript
public:
npc_fallen_hero_of_horde() : CreatureScript("npc_fallen_hero_of_horde") { }
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+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(1392, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1392, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+11:
pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1411, creature->GetGUID());
if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(2784);
if (pPlayer->GetTeam() == ALLIANCE)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1411, creature->GetGUID());
}
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
pPlayer->SEND_GOSSIP_MENU(1451, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1451, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+21:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
pPlayer->SEND_GOSSIP_MENU(1452, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1452, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+22:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
pPlayer->SEND_GOSSIP_MENU(1453, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1453, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+23:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
pPlayer->SEND_GOSSIP_MENU(1454, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1454, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+24:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
pPlayer->SEND_GOSSIP_MENU(1455, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1455, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+25:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
pPlayer->SEND_GOSSIP_MENU(1456, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(1456, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+26:
pPlayer->CLOSE_GOSSIP_MENU();
@@ -140,10 +140,10 @@ 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(2784) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
@@ -154,7 +154,7 @@ public:
if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == ALLIANCE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, 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;
}