diff options
| author | click <click@gonnamakeyou.com> | 2011-07-02 22:18:03 +0200 |
|---|---|---|
| committer | click <click@gonnamakeyou.com> | 2011-07-02 22:18:03 +0200 |
| commit | f91ee24184dffcd686d60dd07a1d19da3f5da818 (patch) | |
| tree | 83d06dd9c18ca0d69c35e0937c14bdd83c3c98d9 /src/server/scripts/EasternKingdoms/ScarletEnclave | |
| parent | 3ddc1cc4c40b757dd42b781552b483a047a6df64 (diff) | |
Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ScarletEnclave')
4 files changed, 61 insertions, 61 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index bc25fe7a753..34a30dd81bf 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -95,9 +95,9 @@ class npc_unworthy_initiate : public CreatureScript public: npc_unworthy_initiate() : CreatureScript("npc_unworthy_initiate") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_unworthy_initiateAI(pCreature); + return new npc_unworthy_initiateAI(creature); } struct npc_unworthy_initiateAI : public ScriptedAI @@ -286,9 +286,9 @@ class npc_unworthy_initiate_anchor : public CreatureScript public: npc_unworthy_initiate_anchor() : CreatureScript("npc_unworthy_initiate_anchor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_unworthy_initiate_anchorAI(pCreature); + return new npc_unworthy_initiate_anchorAI(creature); } struct npc_unworthy_initiate_anchorAI : public PassiveAI @@ -362,58 +362,58 @@ class npc_death_knight_initiate : public CreatureScript public: npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { } - 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(); - if (pPlayer->isInCombat() || pCreature->isInCombat()) + if (pPlayer->isInCombat() || creature->isInCombat()) return true; - if (npc_death_knight_initiateAI* pInitiateAI = CAST_AI(npc_death_knight_initiate::npc_death_knight_initiateAI, pCreature->AI())) + if (npc_death_knight_initiateAI* pInitiateAI = CAST_AI(npc_death_knight_initiate::npc_death_knight_initiateAI, creature->AI())) { if (pInitiateAI->m_bIsDuelInProgress) return true; } - pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15); int32 uiSayId = rand()% (sizeof(m_auiRandomSay)/sizeof(int32)); - DoScriptText(m_auiRandomSay[uiSayId], pCreature, pPlayer); + DoScriptText(m_auiRandomSay[uiSayId], creature, pPlayer); - pPlayer->CastSpell(pCreature, SPELL_DUEL, false); + pPlayer->CastSpell(creature, SPELL_DUEL, false); pPlayer->CastSpell(pPlayer, SPELL_DUEL_FLAG, true); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pPlayer->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && pCreature->IsFullHealth()) + if (pPlayer->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && creature->IsFullHealth()) { if (pPlayer->HealthBelowPct(10)) return true; - if (pPlayer->isInCombat() || pCreature->isInCombat()) + if (pPlayer->isInCombat() || creature->isInCombat()) return true; pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, 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; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_death_knight_initiateAI(pCreature); + return new npc_death_knight_initiateAI(creature); } struct npc_death_knight_initiateAI : public CombatAI { - npc_death_knight_initiateAI(Creature* pCreature) : CombatAI(pCreature) + npc_death_knight_initiateAI(Creature* creature) : CombatAI(creature) { m_bIsDuelInProgress = false; } @@ -524,9 +524,9 @@ class npc_dark_rider_of_acherus : public CreatureScript public: npc_dark_rider_of_acherus() : CreatureScript("npc_dark_rider_of_acherus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_dark_rider_of_acherusAI(pCreature); + return new npc_dark_rider_of_acherusAI(creature); } struct npc_dark_rider_of_acherusAI : public ScriptedAI @@ -616,9 +616,9 @@ class npc_salanar_the_horseman : public CreatureScript public: npc_salanar_the_horseman() : CreatureScript("npc_salanar_the_horseman") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_salanar_the_horsemanAI(pCreature); + return new npc_salanar_the_horsemanAI(creature); } struct npc_salanar_the_horsemanAI : public ScriptedAI @@ -685,9 +685,9 @@ class npc_ros_dark_rider : public CreatureScript public: npc_ros_dark_rider() : CreatureScript("npc_ros_dark_rider") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_ros_dark_riderAI(pCreature); + return new npc_ros_dark_riderAI(creature); } struct npc_ros_dark_riderAI : public ScriptedAI @@ -736,9 +736,9 @@ class npc_dkc1_gothik : public CreatureScript public: npc_dkc1_gothik() : CreatureScript("npc_dkc1_gothik") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_dkc1_gothikAI(pCreature); + return new npc_dkc1_gothikAI(creature); } struct npc_dkc1_gothikAI : public ScriptedAI @@ -778,9 +778,9 @@ class npc_scarlet_ghoul : public CreatureScript public: npc_scarlet_ghoul() : CreatureScript("npc_scarlet_ghoul") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_scarlet_ghoulAI(pCreature); + return new npc_scarlet_ghoulAI(creature); } struct npc_scarlet_ghoulAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 50f761b4fa7..b68a7a5d777 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -49,14 +49,14 @@ class npc_crusade_persuaded : public CreatureScript public: npc_crusade_persuaded() : CreatureScript("npc_crusade_persuaded") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_crusade_persuadedAI (pCreature); + return new npc_crusade_persuadedAI (creature); } struct npc_crusade_persuadedAI : public ScriptedAI { - npc_crusade_persuadedAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_crusade_persuadedAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiSpeech_timer; uint32 uiSpeech_counter; @@ -177,26 +177,26 @@ class npc_koltira_deathweaver : public CreatureScript public: npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_BREAKOUT) { - pCreature->SetStandState(UNIT_STAND_STATE_STAND); + creature->SetStandState(UNIT_STAND_STATE_STAND); - if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI, creature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID()); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_koltira_deathweaverAI(pCreature); + return new npc_koltira_deathweaverAI(creature); } struct npc_koltira_deathweaverAI : public npc_escortAI { - npc_koltira_deathweaverAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_koltira_deathweaverAI(Creature* creature) : npc_escortAI(creature) { me->SetReactState(REACT_DEFENSIVE); } @@ -356,14 +356,14 @@ class mob_scarlet_courier : public CreatureScript public: mob_scarlet_courier() : CreatureScript("mob_scarlet_courier") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_scarlet_courierAI (pCreature); + return new mob_scarlet_courierAI (creature); } struct mob_scarlet_courierAI : public ScriptedAI { - mob_scarlet_courierAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_scarlet_courierAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiStage; uint32 uiStage_timer; @@ -450,14 +450,14 @@ class mob_high_inquisitor_valroth : public CreatureScript public: mob_high_inquisitor_valroth() : CreatureScript("mob_high_inquisitor_valroth") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_high_inquisitor_valrothAI (pCreature); + return new mob_high_inquisitor_valrothAI (creature); } struct mob_high_inquisitor_valrothAI : public ScriptedAI { - mob_high_inquisitor_valrothAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiRenew_timer; uint32 uiInquisitor_Penance_timer; @@ -586,14 +586,14 @@ class npc_a_special_surprise : public CreatureScript public: npc_a_special_surprise() : CreatureScript("npc_a_special_surprise") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_a_special_surpriseAI(pCreature); + return new npc_a_special_surpriseAI(creature); } struct npc_a_special_surpriseAI : public ScriptedAI { - npc_a_special_surpriseAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_a_special_surpriseAI(Creature* creature) : ScriptedAI(creature) {} uint32 ExecuteSpeech_Timer; uint32 ExecuteSpeech_Counter; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 04d8244ffc7..ca0c19e7032 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -287,41 +287,41 @@ class npc_highlord_darion_mograine : public CreatureScript public: npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") { } - 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->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, pCreature->AI())->uiStep = 1; - CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, pCreature->AI())->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->uiStep = 1; + CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->Start(true, false, pPlayer->GetGUID()); break; } 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(12801) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(0, "I am ready.", 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; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_highlord_darion_mograineAI(pCreature); + return new npc_highlord_darion_mograineAI(creature); } struct npc_highlord_darion_mograineAI : public npc_escortAI { - npc_highlord_darion_mograineAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_highlord_darion_mograineAI(Creature* creature) : npc_escortAI(creature) { Reset(); } @@ -1671,14 +1671,14 @@ class npc_the_lich_king_tirion_dawn : public CreatureScript public: npc_the_lich_king_tirion_dawn() : CreatureScript("npc_the_lich_king_tirion_dawn") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_the_lich_king_tirion_dawnAI (pCreature); + return new npc_the_lich_king_tirion_dawnAI (creature); } struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI { - npc_the_lich_king_tirion_dawnAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); } + npc_the_lich_king_tirion_dawnAI(Creature* creature) : ScriptedAI(creature) { Reset(); } void Reset() {} void AttackStart(Unit* /*who*/) {} // very sample, just don't make them aggreesive void UpdateAI(const uint32 /*diff*/) {} diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index 2bea5547a4d..e6cd684de6c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -28,9 +28,9 @@ class npc_valkyr_battle_maiden : public CreatureScript public: npc_valkyr_battle_maiden() : CreatureScript("npc_valkyr_battle_maiden") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_valkyr_battle_maidenAI (pCreature); + return new npc_valkyr_battle_maidenAI (creature); } struct npc_valkyr_battle_maidenAI : public PassiveAI |
