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/Karazhan/boss_curator.cpp
+2 -2
View File
@@ -48,9 +48,9 @@ class boss_curator : public CreatureScript
public:
boss_curator() : CreatureScript("boss_curator") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_curatorAI (pCreature);
return new boss_curatorAI (creature);
}
struct boss_curatorAI : public ScriptedAI
src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+2 -2
View File
@@ -44,9 +44,9 @@ class boss_maiden_of_virtue : public CreatureScript
public:
boss_maiden_of_virtue() : CreatureScript("boss_maiden_of_virtue") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_maiden_of_virtueAI (pCreature);
return new boss_maiden_of_virtueAI (creature);
}
struct boss_maiden_of_virtueAI : public ScriptedAI
src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+4 -4
View File
@@ -51,9 +51,9 @@ class boss_attumen : public CreatureScript
public:
boss_attumen() : CreatureScript("boss_attumen") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_attumenAI (pCreature);
return new boss_attumenAI (creature);
}
struct boss_attumenAI : public ScriptedAI
@@ -112,9 +112,9 @@ class boss_midnight : public CreatureScript
public:
boss_midnight() : CreatureScript("boss_midnight") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_midnightAI(pCreature);
return new boss_midnightAI(creature);
}
struct boss_midnightAI : public ScriptedAI
src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+21 -21
View File
@@ -65,9 +65,9 @@ class boss_moroes : public CreatureScript
public:
boss_moroes() : CreatureScript("boss_moroes") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_moroesAI (pCreature);
return new boss_moroesAI (creature);
}
struct boss_moroesAI : public ScriptedAI
@@ -155,7 +155,7 @@ public:
DeSpawnAdds();
if (isAddlistEmpty())
{
Creature* pCreature = NULL;
Creature* creature = NULL;
std::vector<uint32> AddList;
for (uint8 i = 0; i < 6; ++i)
@@ -169,10 +169,10 @@ public:
{
uint32 entry = *itr;
pCreature = me->SummonCreature(entry, Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
if (pCreature)
creature = me->SummonCreature(entry, Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
if (creature)
{
AddGUID[i] = pCreature->GetGUID();
AddGUID[i] = creature->GetGUID();
AddId[i] = entry;
}
++i;
@@ -181,10 +181,10 @@ public:
{
for (uint8 i = 0; i < 4; ++i)
{
Creature* pCreature = me->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
if (pCreature)
Creature* creature = me->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
if (creature)
{
AddGUID[i] = pCreature->GetGUID();
AddGUID[i] = creature->GetGUID();
}
}
}
@@ -409,9 +409,9 @@ class boss_baroness_dorothea_millstipe : public CreatureScript
public:
boss_baroness_dorothea_millstipe() : CreatureScript("boss_baroness_dorothea_millstipe") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_baroness_dorothea_millstipeAI (pCreature);
return new boss_baroness_dorothea_millstipeAI (creature);
}
struct boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI
@@ -473,9 +473,9 @@ class boss_baron_rafe_dreuger : public CreatureScript
public:
boss_baron_rafe_dreuger() : CreatureScript("boss_baron_rafe_dreuger") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_baron_rafe_dreugerAI (pCreature);
return new boss_baron_rafe_dreugerAI (creature);
}
struct boss_baron_rafe_dreugerAI : public boss_moroes_guestAI
@@ -531,9 +531,9 @@ class boss_lady_catriona_von_indi : public CreatureScript
public:
boss_lady_catriona_von_indi() : CreatureScript("boss_lady_catriona_von_indi") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_lady_catriona_von_indiAI (pCreature);
return new boss_lady_catriona_von_indiAI (creature);
}
struct boss_lady_catriona_von_indiAI : public boss_moroes_guestAI
@@ -602,9 +602,9 @@ class boss_lady_keira_berrybuck : public CreatureScript
public:
boss_lady_keira_berrybuck() : CreatureScript("boss_lady_keira_berrybuck") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_lady_keira_berrybuckAI (pCreature);
return new boss_lady_keira_berrybuckAI (creature);
}
struct boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
@@ -677,9 +677,9 @@ class boss_lord_robin_daris : public CreatureScript
public:
boss_lord_robin_daris() : CreatureScript("boss_lord_robin_daris") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_lord_robin_darisAI (pCreature);
return new boss_lord_robin_darisAI (creature);
}
struct boss_lord_robin_darisAI : public boss_moroes_guestAI
@@ -734,9 +734,9 @@ class boss_lord_crispin_ference : public CreatureScript
public:
boss_lord_crispin_ference() : CreatureScript("boss_lord_crispin_ference") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_lord_crispin_ferenceAI (pCreature);
return new boss_lord_crispin_ferenceAI (creature);
}
struct boss_lord_crispin_ferenceAI : public boss_moroes_guestAI
src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+2 -2
View File
@@ -63,9 +63,9 @@ class boss_netherspite : public CreatureScript
public:
boss_netherspite() : CreatureScript("boss_netherspite") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_netherspiteAI(pCreature);
return new boss_netherspiteAI(creature);
}
struct boss_netherspiteAI : public ScriptedAI
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+2 -2
View File
@@ -63,9 +63,9 @@ class boss_nightbane : public CreatureScript
public:
boss_nightbane() : CreatureScript("boss_nightbane") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_nightbaneAI (pCreature);
return new boss_nightbaneAI (creature);
}
struct boss_nightbaneAI : public ScriptedAI
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+4 -4
View File
@@ -101,9 +101,9 @@ class netherspite_infernal : public CreatureScript
public:
netherspite_infernal() : CreatureScript("netherspite_infernal") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new netherspite_infernalAI (pCreature);
return new netherspite_infernalAI (creature);
}
struct netherspite_infernalAI : public ScriptedAI
@@ -176,9 +176,9 @@ class boss_malchezaar : public CreatureScript
public:
boss_malchezaar() : CreatureScript("boss_malchezaar") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_malchezaarAI (pCreature);
return new boss_malchezaarAI (creature);
}
struct boss_malchezaarAI : public ScriptedAI
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+7 -7
View File
@@ -86,9 +86,9 @@ class boss_shade_of_aran : public CreatureScript
public:
boss_shade_of_aran() : CreatureScript("boss_shade_of_aran") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_aranAI (pCreature);
return new boss_aranAI (creature);
}
struct boss_aranAI : public ScriptedAI
@@ -516,9 +516,9 @@ class mob_aran_elemental : public CreatureScript
public:
mob_aran_elemental() : CreatureScript("mob_aran_elemental") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new water_elementalAI (pCreature);
return new water_elementalAI (creature);
}
struct water_elementalAI : public ScriptedAI
@@ -555,10 +555,10 @@ class mob_shadow_of_aran : public CreatureScript
public:
mob_shadow_of_aran() : CreatureScript("mob_shadow_of_aran") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
sLog->outString("TSCR: Convert simpleAI script for Creature Entry %u to ACID", pCreature->GetEntry());
SimpleAI* ai = new SimpleAI (pCreature);
sLog->outString("TSCR: Convert simpleAI script for Creature Entry %u to ACID", creature->GetEntry());
SimpleAI* ai = new SimpleAI (creature);
ai->Spell[0].Enabled = true;
ai->Spell[0].Spell_Id = SPELL_SHADOW_PYRO;
src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+10 -10
View File
@@ -61,9 +61,9 @@ class mob_kilrek : public CreatureScript
public:
mob_kilrek() : CreatureScript("mob_kilrek") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new mob_kilrekAI (pCreature);
return new mob_kilrekAI (creature);
}
struct mob_kilrekAI : public ScriptedAI
@@ -133,9 +133,9 @@ class mob_demon_chain : public CreatureScript
public:
mob_demon_chain() : CreatureScript("mob_demon_chain") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new mob_demon_chainAI(pCreature);
return new mob_demon_chainAI(creature);
}
struct mob_demon_chainAI : public ScriptedAI
@@ -171,9 +171,9 @@ class mob_fiendish_portal : public CreatureScript
public:
mob_fiendish_portal() : CreatureScript("mob_fiendish_portal") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new mob_fiendish_portalAI (pCreature);
return new mob_fiendish_portalAI (creature);
}
struct mob_fiendish_portalAI : public PassiveAI
@@ -208,9 +208,9 @@ class mob_fiendish_imp : public CreatureScript
public:
mob_fiendish_imp() : CreatureScript("mob_fiendish_imp") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new mob_fiendish_impAI (pCreature);
return new mob_fiendish_impAI (creature);
}
struct mob_fiendish_impAI : public ScriptedAI
@@ -251,9 +251,9 @@ class boss_terestian_illhoof : public CreatureScript
public:
boss_terestian_illhoof() : CreatureScript("boss_terestian_illhoof") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_terestianAI (pCreature);
return new boss_terestianAI (creature);
}
struct boss_terestianAI : public ScriptedAI
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+37 -37
View File
@@ -88,16 +88,16 @@ EndScriptData */
#define CREATURE_CYCLONE 18412
#define CREATURE_CRONE 18168
void SummonCroneIfReady(InstanceScript* pInstance, Creature* pCreature)
void SummonCroneIfReady(InstanceScript* pInstance, Creature* creature)
{
pInstance->SetData(DATA_OPERA_OZ_DEATHCOUNT, SPECIAL); // Increment DeathCount
if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4)
{
if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, pCreature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
if (Creature* pCrone = creature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, creature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
{
if (pCreature->getVictim())
pCrone->AI()->AttackStart(pCreature->getVictim());
if (creature->getVictim())
pCrone->AI()->AttackStart(creature->getVictim());
}
}
};
@@ -107,9 +107,9 @@ class boss_dorothee : public CreatureScript
public:
boss_dorothee() : CreatureScript("boss_dorothee") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_dorotheeAI(pCreature);
return new boss_dorotheeAI(creature);
}
struct boss_dorotheeAI : public ScriptedAI
@@ -222,9 +222,9 @@ class mob_tito : public CreatureScript
public:
mob_tito() : CreatureScript("mob_tito") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new mob_titoAI(pCreature);
return new mob_titoAI(creature);
}
struct mob_titoAI : public ScriptedAI
@@ -289,9 +289,9 @@ class boss_strawman : public CreatureScript
public:
boss_strawman() : CreatureScript("boss_strawman") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_strawmanAI(pCreature);
return new boss_strawmanAI(creature);
}
struct boss_strawmanAI : public ScriptedAI
@@ -404,9 +404,9 @@ class boss_tinhead : public CreatureScript
public:
boss_tinhead() : CreatureScript("boss_tinhead") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_tinheadAI(pCreature);
return new boss_tinheadAI(creature);
}
struct boss_tinheadAI : public ScriptedAI
@@ -514,9 +514,9 @@ class boss_roar : public CreatureScript
public:
boss_roar() : CreatureScript("boss_roar") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_roarAI(pCreature);
return new boss_roarAI(creature);
}
struct boss_roarAI : public ScriptedAI
@@ -623,9 +623,9 @@ class boss_crone : public CreatureScript
public:
boss_crone() : CreatureScript("boss_crone") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_croneAI(pCreature);
return new boss_croneAI(creature);
}
struct boss_croneAI : public ScriptedAI
@@ -705,9 +705,9 @@ class mob_cyclone : public CreatureScript
public:
mob_cyclone() : CreatureScript("mob_cyclone") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new mob_cycloneAI(pCreature);
return new mob_cycloneAI(creature);
}
struct mob_cycloneAI : public ScriptedAI
@@ -769,24 +769,24 @@ class npc_grandmother : public CreatureScript
public:
npc_grandmother() : CreatureScript("npc_grandmother") { }
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)
{
if (Creature* pBigBadWolf = pCreature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
if (Creature* pBigBadWolf = creature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
pBigBadWolf->AI()->AttackStart(pPlayer);
pCreature->DespawnOrUnsummon();
creature->DespawnOrUnsummon();
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
bool OnGossipHello(Player* pPlayer, Creature* creature)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(8990, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(8990, creature->GetGUID());
return true;
}
@@ -798,9 +798,9 @@ class boss_bigbadwolf : public CreatureScript
public:
boss_bigbadwolf() : CreatureScript("boss_bigbadwolf") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_bigbadwolfAI(pCreature);
return new boss_bigbadwolfAI(creature);
}
struct boss_bigbadwolfAI : public ScriptedAI
@@ -966,15 +966,15 @@ enum RAJPhase
PHASE_BOTH = 2,
};
void PretendToDie(Creature* pCreature)
void PretendToDie(Creature* creature)
{
pCreature->InterruptNonMeleeSpells(true);
pCreature->RemoveAllAuras();
pCreature->SetHealth(0);
pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pCreature->GetMotionMaster()->MovementExpired(false);
pCreature->GetMotionMaster()->MoveIdle();
pCreature->SetStandState(UNIT_STAND_STATE_DEAD);
creature->InterruptNonMeleeSpells(true);
creature->RemoveAllAuras();
creature->SetHealth(0);
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
creature->GetMotionMaster()->MovementExpired(false);
creature->GetMotionMaster()->MoveIdle();
creature->SetStandState(UNIT_STAND_STATE_DEAD);
};
void Resurrect(Creature* pTarget)
@@ -997,9 +997,9 @@ class boss_julianne : public CreatureScript
public:
boss_julianne() : CreatureScript("boss_julianne") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_julianneAI(pCreature);
return new boss_julianneAI(creature);
}
struct boss_julianneAI : public ScriptedAI
@@ -1120,9 +1120,9 @@ class boss_romulo : public CreatureScript
public:
boss_romulo() : CreatureScript("boss_romulo") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_romuloAI(pCreature);
return new boss_romuloAI(creature);
}
struct boss_romuloAI : public ScriptedAI
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+20 -20
View File
@@ -252,11 +252,11 @@ public:
uint32 entry = ((uint32)Spawns[index][0]);
float PosX = Spawns[index][1];
if (Creature* pCreature = me->SummonCreature(entry, PosX, SPAWN_Y, SPAWN_Z, SPAWN_O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
if (Creature* creature = me->SummonCreature(entry, PosX, SPAWN_Y, SPAWN_Z, SPAWN_O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
{
// In case database has bad flags
pCreature->SetUInt32Value(UNIT_FIELD_FLAGS, 0);
pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
creature->SetUInt32Value(UNIT_FIELD_FLAGS, 0);
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
}
@@ -324,16 +324,16 @@ public:
}
};
bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
{
pPlayer->PlayerTalkClass->ClearMenus();
npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, pCreature->AI());
npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI());
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(8971, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(8971, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->CLOSE_GOSSIP_MENU();
@@ -359,9 +359,9 @@ public:
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
bool OnGossipHello(Player* pPlayer, Creature* creature)
{
if (InstanceScript* pInstance = pCreature->GetInstanceScript())
if (InstanceScript* pInstance = creature->GetInstanceScript())
{
// Check for death of Moroes and if opera event is not done already
if (pInstance->GetData(TYPE_MOROES) == DONE && pInstance->GetData(TYPE_OPERA) != DONE)
@@ -375,25 +375,25 @@ public:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
}
if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, pCreature->AI()))
if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()))
{
if (!pBarnesAI->RaidWiped)
pPlayer->SEND_GOSSIP_MENU(8970, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(8970, creature->GetGUID());
else
pPlayer->SEND_GOSSIP_MENU(8975, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(8975, creature->GetGUID());
return true;
}
}
}
pPlayer->SEND_GOSSIP_MENU(8978, pCreature->GetGUID());
pPlayer->SEND_GOSSIP_MENU(8978, creature->GetGUID());
return true;
}
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new npc_barnesAI(pCreature);
return new npc_barnesAI(creature);
}
};
@@ -414,7 +414,7 @@ class npc_berthold : public CreatureScript
public:
npc_berthold() : CreatureScript("npc_berthold") { }
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)
@@ -424,16 +424,16 @@ public:
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
bool OnGossipHello(Player* pPlayer, Creature* creature)
{
if (InstanceScript* pInstance = pCreature->GetInstanceScript())
if (InstanceScript* pInstance = creature->GetInstanceScript())
{
// Check if Shade of Aran event is done
if (pInstance->GetData(TYPE_ARAN) == DONE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, 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;
}
@@ -467,9 +467,9 @@ class npc_image_of_medivh : public CreatureScript
public:
npc_image_of_medivh() : CreatureScript("npc_image_of_medivh") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* creature) const
{
return new npc_image_of_medivhAI(pCreature);
return new npc_image_of_medivhAI(creature);
}
struct npc_image_of_medivhAI : public ScriptedAI