From f91ee24184dffcd686d60dd07a1d19da3f5da818 Mon Sep 17 00:00:00 2001 From: click Date: Sat, 2 Jul 2011 22:18:03 +0200 Subject: Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature --- .../scripts/Outland/TempestKeep/Eye/boss_alar.cpp | 16 +++++----- .../Outland/TempestKeep/Eye/boss_astromancer.cpp | 12 ++++---- .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 36 +++++++++++----------- .../Outland/TempestKeep/Eye/boss_void_reaver.cpp | 4 +-- .../scripts/Outland/TempestKeep/Eye/the_eye.cpp | 2 +- .../Mechanar/boss_gatewatcher_ironhand.cpp | 2 +- .../Mechanar/boss_nethermancer_sepethrea.cpp | 8 ++--- .../Mechanar/boss_pathaleon_the_calculator.cpp | 12 ++++---- .../Outland/TempestKeep/arcatraz/arcatraz.cpp | 10 +++--- .../arcatraz/boss_harbinger_skyriss.cpp | 10 +++--- .../botanica/boss_high_botanist_freywinn.cpp | 2 +- .../Outland/TempestKeep/botanica/boss_laj.cpp | 2 +- .../TempestKeep/botanica/boss_warp_splinter.cpp | 8 ++--- 13 files changed, 62 insertions(+), 62 deletions(-) (limited to 'src/server/scripts/Outland/TempestKeep') diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 67b67f61742..f57d28978f1 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -80,10 +80,10 @@ class boss_alar : public CreatureScript } struct boss_alarAI : public ScriptedAI { - boss_alarAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_alarAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); - DefaultMoveSpeedRate = pCreature->GetSpeedRate(MOVE_RUN); + pInstance = creature->GetInstanceScript(); + DefaultMoveSpeedRate = creature->GetSpeedRate(MOVE_RUN); } InstanceScript *pInstance; @@ -467,11 +467,11 @@ class mob_ember_of_alar : public CreatureScript struct mob_ember_of_alarAI : public ScriptedAI { - mob_ember_of_alarAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_ember_of_alarAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); - pCreature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); - pCreature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); + pInstance = creature->GetInstanceScript(); + creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } InstanceScript *pInstance; @@ -546,7 +546,7 @@ class mob_flame_patch_alar : public CreatureScript struct mob_flame_patch_alarAI : public ScriptedAI { - mob_flame_patch_alarAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} void AttackStart(Unit* /*who*/) {} diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index b14803a9214..a87d87767c0 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -83,12 +83,12 @@ class boss_high_astromancer_solarian : public CreatureScript struct boss_high_astromancer_solarianAI : public ScriptedAI { - boss_high_astromancer_solarianAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + boss_high_astromancer_solarianAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); - defaultarmor = pCreature->GetArmor(); - defaultsize = pCreature->GetFloatValue(OBJECT_FIELD_SCALE_X); + defaultarmor = creature->GetArmor(); + defaultsize = creature->GetFloatValue(OBJECT_FIELD_SCALE_X); } InstanceScript *pInstance; @@ -417,9 +417,9 @@ class mob_solarium_priest : public CreatureScript struct mob_solarium_priestAI : public ScriptedAI { - mob_solarium_priestAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_solarium_priestAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript *pInstance; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index a2d0fbd5ba7..0b94e4ad13e 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -145,9 +145,9 @@ const float afGravityPos[3] = {795.0f, 0.0f, 70.0f}; //Base AI for Advisors struct advisorbase_ai : public ScriptedAI { - advisorbase_ai(Creature* pCreature) : ScriptedAI(pCreature) + advisorbase_ai(Creature* creature) : ScriptedAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); m_bDoubled_Health = false; } @@ -278,9 +278,9 @@ class boss_kaelthas : public CreatureScript //Kael'thas AI struct boss_kaelthasAI : public ScriptedAI { - boss_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature), summons(me) + boss_kaelthasAI(Creature* creature) : ScriptedAI(creature), summons(me) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); memset(&m_auiAdvisorGuid, 0, sizeof(m_auiAdvisorGuid)); } @@ -343,12 +343,12 @@ class boss_kaelthas : public CreatureScript { for (uint8 i = 0; i < MAX_ADVISORS; ++i) { - if (Creature* pCreature = Unit::GetCreature((*me), m_auiAdvisorGuid[i])) + if (Creature* creature = Unit::GetCreature((*me), m_auiAdvisorGuid[i])) { - pCreature->Respawn(); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pCreature->setFaction(me->getFaction()); - pCreature->AI()->EnterEvadeMode(); + creature->Respawn(); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + creature->setFaction(me->getFaction()); + creature->AI()->EnterEvadeMode(); } } } @@ -1016,7 +1016,7 @@ class boss_thaladred_the_darkener : public CreatureScript } struct boss_thaladred_the_darkenerAI : public advisorbase_ai { - boss_thaladred_the_darkenerAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + boss_thaladred_the_darkenerAI(Creature* creature) : advisorbase_ai(creature) {} uint32 Gaze_Timer; uint32 Silence_Timer; @@ -1114,7 +1114,7 @@ class boss_lord_sanguinar : public CreatureScript } struct boss_lord_sanguinarAI : public advisorbase_ai { - boss_lord_sanguinarAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + boss_lord_sanguinarAI(Creature* creature) : advisorbase_ai(creature) {} uint32 Fear_Timer; @@ -1181,7 +1181,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } struct boss_grand_astromancer_capernianAI : public advisorbase_ai { - boss_grand_astromancer_capernianAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + boss_grand_astromancer_capernianAI(Creature* creature) : advisorbase_ai(creature) {} uint32 Fireball_Timer; uint32 Conflagration_Timer; @@ -1326,7 +1326,7 @@ class boss_master_engineer_telonicus : public CreatureScript } struct boss_master_engineer_telonicusAI : public advisorbase_ai { - boss_master_engineer_telonicusAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + boss_master_engineer_telonicusAI(Creature* creature) : advisorbase_ai(creature) {} uint32 Bomb_Timer; uint32 RemoteToy_Timer; @@ -1409,7 +1409,7 @@ class mob_kael_flamestrike : public CreatureScript } struct mob_kael_flamestrikeAI : public Scripted_NoMovementAI { - mob_kael_flamestrikeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) {} + mob_kael_flamestrikeAI(Creature* creature) : Scripted_NoMovementAI(creature) {} uint32 Timer; bool Casting; @@ -1473,7 +1473,7 @@ class mob_phoenix_tk : public CreatureScript } struct mob_phoenix_tkAI : public ScriptedAI { - mob_phoenix_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_phoenix_tkAI(Creature* creature) : ScriptedAI(creature) {} uint32 Cycle_Timer; @@ -1527,7 +1527,7 @@ class mob_phoenix_egg_tk : public CreatureScript } struct mob_phoenix_egg_tkAI : public ScriptedAI { - mob_phoenix_egg_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_phoenix_egg_tkAI(Creature* creature) : ScriptedAI(creature) {} uint32 Rebirth_Timer; @@ -1571,9 +1571,9 @@ class mob_phoenix_egg_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_phoenix_egg_tkAI(pCreature); + return new mob_phoenix_egg_tkAI(creature); } }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index a16f2d16cfe..94ea9e0fd68 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -53,9 +53,9 @@ class boss_void_reaver : public CreatureScript struct boss_void_reaverAI : public ScriptedAI { - boss_void_reaverAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_void_reaverAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index 12f95fdb4aa..e54e55789ae 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -46,7 +46,7 @@ class mob_crystalcore_devastator : public CreatureScript } struct mob_crystalcore_devastatorAI : public ScriptedAI { - mob_crystalcore_devastatorAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_crystalcore_devastatorAI(Creature* creature) : ScriptedAI(creature) {} uint32 Knockaway_Timer; uint32 Countercharge_Timer; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index b81b74a7fa9..df7f95abe2a 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -58,7 +58,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript // Gatewatcher Iron-Hand AI struct boss_gatewatcher_iron_handAI : public ScriptedAI { - boss_gatewatcher_iron_handAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_gatewatcher_iron_handAI(Creature* creature) : ScriptedAI(creature) { } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 8c5abbcadc0..a5ad891012e 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -61,9 +61,9 @@ class boss_nethermancer_sepethrea : public CreatureScript } struct boss_nethermancer_sepethreaAI : public ScriptedAI { - boss_nethermancer_sepethreaAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_nethermancer_sepethreaAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript *pInstance; @@ -183,9 +183,9 @@ class mob_ragin_flames : public CreatureScript struct mob_ragin_flamesAI : public ScriptedAI { - mob_ragin_flamesAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_ragin_flamesAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript *pInstance; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 056b46a38fd..1b2a104dc66 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -65,7 +65,7 @@ class boss_pathaleon_the_calculator : public CreatureScript struct boss_pathaleon_the_calculatorAI : public ScriptedAI { - boss_pathaleon_the_calculatorAI(Creature* pCreature) : ScriptedAI(pCreature), summons(me) + boss_pathaleon_the_calculatorAI(Creature* creature) : ScriptedAI(creature), summons(me) { } @@ -192,9 +192,9 @@ class boss_pathaleon_the_calculator : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_pathaleon_the_calculatorAI (pCreature); + return new boss_pathaleon_the_calculatorAI (creature); } }; @@ -209,7 +209,7 @@ class mob_nether_wraith : public CreatureScript struct mob_nether_wraithAI : public ScriptedAI { - mob_nether_wraithAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_nether_wraithAI(Creature* creature) : ScriptedAI(creature) {} uint32 ArcaneMissiles_Timer; uint32 Detonation_Timer; @@ -267,9 +267,9 @@ class mob_nether_wraith : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_nether_wraithAI (pCreature); + return new mob_nether_wraithAI (creature); } }; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 2d2ac51a317..8e6c0b830e6 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -76,9 +76,9 @@ class npc_millhouse_manastorm : public CreatureScript } struct npc_millhouse_manastormAI : public ScriptedAI { - npc_millhouse_manastormAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_millhouse_manastormAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -280,9 +280,9 @@ class npc_warden_mellichar : public CreatureScript } struct npc_warden_mellicharAI : public ScriptedAI { - npc_warden_mellicharAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_warden_mellicharAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -536,7 +536,7 @@ class mob_zerekethvoidzone : public CreatureScript } struct mob_zerekethvoidzoneAI : public ScriptedAI { - mob_zerekethvoidzoneAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index b0580df3e42..5fa365ac4ac 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -67,9 +67,9 @@ class boss_harbinger_skyriss : public CreatureScript } struct boss_harbinger_skyrissAI : public ScriptedAI { - boss_harbinger_skyrissAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_harbinger_skyrissAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); Intro = false; } @@ -271,9 +271,9 @@ class boss_harbinger_skyriss : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_harbinger_skyrissAI (pCreature); + return new boss_harbinger_skyrissAI (creature); } }; @@ -290,7 +290,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript } struct boss_harbinger_skyriss_illusionAI : public ScriptedAI { - boss_harbinger_skyriss_illusionAI(Creature* pCreature) : ScriptedAI(pCreature) {} + boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 3a91b23599a..e130512f08c 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -59,7 +59,7 @@ class boss_high_botanist_freywinn : public CreatureScript struct boss_high_botanist_freywinnAI : public ScriptedAI { - boss_high_botanist_freywinnAI(Creature* pCreature) : ScriptedAI(pCreature) {} + boss_high_botanist_freywinnAI(Creature* creature) : ScriptedAI(creature) {} std::list Adds_List; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index e8adc8659c4..872421f7561 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -60,7 +60,7 @@ class boss_laj : public CreatureScript struct boss_lajAI : public ScriptedAI { - boss_lajAI(Creature* pCreature) : ScriptedAI(pCreature) {} + boss_lajAI(Creature* creature) : ScriptedAI(creature) {} bool CanSummon; uint32 Teleport_Timer; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index df6da33ad43..1acc75981e0 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -73,7 +73,7 @@ class mob_warp_splinter_treant : public CreatureScript } struct mob_warp_splinter_treantAI : public ScriptedAI { - mob_warp_splinter_treantAI (Creature* pCreature) : ScriptedAI(pCreature) + mob_warp_splinter_treantAI (Creature* creature) : ScriptedAI(creature) { WarpGuid = 0; } @@ -137,10 +137,10 @@ class boss_warp_splinter : public CreatureScript } struct boss_warp_splinterAI : public ScriptedAI { - boss_warp_splinterAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_warp_splinterAI(Creature* creature) : ScriptedAI(creature) { - Treant_Spawn_Pos_X = pCreature->GetPositionX(); - Treant_Spawn_Pos_Y = pCreature->GetPositionY(); + Treant_Spawn_Pos_X = creature->GetPositionX(); + Treant_Spawn_Pos_Y = creature->GetPositionY(); } uint32 War_Stomp_Timer; -- cgit v1.2.3