diff options
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 86 | ||||
| -rw-r--r-- | src/server/scripts/World/guards.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/item_scripts.cpp | 18 | ||||
| -rw-r--r-- | src/server/scripts/World/mob_generic_creature.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/World/npc_innkeeper.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 76 |
6 files changed, 98 insertions, 98 deletions
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 4ebb0fc3aea..de59cdf8841 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -65,7 +65,7 @@ class go_cat_figurine : public GameObjectScript public: go_cat_figurine() : GameObjectScript("go_cat_figurine") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true); return false; @@ -80,7 +80,7 @@ class go_northern_crystal_pylon : public GameObjectScript public: go_northern_crystal_pylon() : GameObjectScript("go_northern_crystal_pylon") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -100,7 +100,7 @@ class go_eastern_crystal_pylon : public GameObjectScript public: go_eastern_crystal_pylon() : GameObjectScript("go_eastern_crystal_pylon") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -120,7 +120,7 @@ class go_western_crystal_pylon : public GameObjectScript public: go_western_crystal_pylon() : GameObjectScript("go_western_crystal_pylon") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -144,7 +144,7 @@ class go_barov_journal : public GameObjectScript public: go_barov_journal() : GameObjectScript("go_barov_journal") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086)) { @@ -163,7 +163,7 @@ class go_field_repair_bot_74A : public GameObjectScript public: go_field_repair_bot_74A() : GameObjectScript("go_field_repair_bot_74A") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704)) { @@ -187,7 +187,7 @@ class go_gilded_brazier : public GameObjectScript public: go_gilded_brazier() : GameObjectScript("go_gilded_brazier") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) { @@ -210,7 +210,7 @@ class go_orb_of_command : public GameObjectScript public: go_orb_of_command() : GameObjectScript("go_orb_of_command") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(7761)) pPlayer->CastSpell(pPlayer, 23460, true); @@ -228,7 +228,7 @@ class go_tablet_of_madness : public GameObjectScript public: go_tablet_of_madness() : GameObjectScript("go_tablet_of_madness") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266)) { @@ -248,7 +248,7 @@ public: go_tablet_of_the_seven() : GameObjectScript("go_tablet_of_the_seven") { } //TODO: use gossip option ("Transcript the Tablet") instead, if Trinity adds support. - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) return true; @@ -269,7 +269,7 @@ class go_jump_a_tron : public GameObjectScript public: go_jump_a_tron() : GameObjectScript("go_jump_a_tron") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) pPlayer->CastSpell(pPlayer, 33382, true); @@ -303,7 +303,7 @@ class go_ethereum_prison : public GameObjectScript public: go_ethereum_prison() : GameObjectScript("go_ethereum_prison") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { int Random = rand() % (sizeof(NpcPrisonEntry) / sizeof(uint32)); @@ -353,7 +353,7 @@ class go_ethereum_stasis : public GameObjectScript public: go_ethereum_stasis() : GameObjectScript("go_ethereum_stasis") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { int Random = rand() % (sizeof(NpcStasisEntry) / sizeof(uint32)); @@ -379,7 +379,7 @@ class go_resonite_cask : public GameObjectScript public: go_resonite_cask() : GameObjectScript("go_resonite_cask") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) pGO->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000); @@ -399,7 +399,7 @@ class go_sacred_fire_of_life : public GameObjectScript public: go_sacred_fire_of_life() : GameObjectScript("go_sacred_fire_of_life") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) pPlayer->SummonCreature(NPC_ARIKARA, -5008.338f, -2118.894f, 83.657f, 0.874f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -427,7 +427,7 @@ class go_shrine_of_the_birds : public GameObjectScript public: go_shrine_of_the_birds() : GameObjectScript("go_shrine_of_the_birds") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { uint32 BirdEntry = 0; @@ -470,7 +470,7 @@ class go_southfury_moonstone : public GameObjectScript public: go_southfury_moonstone() : GameObjectScript("go_southfury_moonstone") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose //pPlayer->CastSpell(pPlayer, SPELL_SUMMON_RIZZLE, false); @@ -498,7 +498,7 @@ class go_tele_to_dalaran_crystal : public GameObjectScript public: go_tele_to_dalaran_crystal() : GameObjectScript("go_tele_to_dalaran_crystal") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) { @@ -520,7 +520,7 @@ class go_tele_to_violet_stand : public GameObjectScript public: go_tele_to_violet_stand() : GameObjectScript("go_tele_to_violet_stand") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || pPlayer->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; @@ -550,7 +550,7 @@ class go_fel_crystalforge : public GameObjectScript public: go_fel_crystalforge() : GameObjectScript("go_fel_crystalforge") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ pPlayer->PrepareQuestMenu(pGO->GetGUID()); /* return true*/ @@ -563,7 +563,7 @@ public: return true; } - bool OnGossipSelect(Player *pPlayer, GameObject *pGO, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch(uiAction) @@ -609,7 +609,7 @@ class go_bashir_crystalforge : public GameObjectScript public: go_bashir_crystalforge() : GameObjectScript("go_bashir_crystalforge") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ pPlayer->PrepareQuestMenu(pGO->GetGUID()); /* return true*/ @@ -622,7 +622,7 @@ public: return true; } - bool OnGossipSelect(Player *pPlayer, GameObject *pGO, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch(uiAction) @@ -673,7 +673,7 @@ class go_matrix_punchograph : public GameObjectScript public: go_matrix_punchograph() : GameObjectScript("go_matrix_punchograph") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { switch(pGO->GetEntry()) { @@ -726,9 +726,9 @@ class go_rusty_cage : public GameObjectScript public: go_rusty_cage() : GameObjectScript("go_rusty_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { - if (Creature *pGoblinPrisoner = pGO->FindNearestCreature(NPC_GOBLIN_PRISIONER, 5.0f, true)) + if (Creature* pGoblinPrisoner = pGO->FindNearestCreature(NPC_GOBLIN_PRISIONER, 5.0f, true)) { pGO->SetGoState(GO_STATE_ACTIVE); pPlayer->KilledMonsterCredit(NPC_GOBLIN_PRISIONER, pGoblinPrisoner->GetGUID()); @@ -753,9 +753,9 @@ class go_scourge_cage : public GameObjectScript public: go_scourge_cage() : GameObjectScript("go_scourge_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { - if (Creature *pNearestPrisoner = pGO->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true)) + if (Creature* pNearestPrisoner = pGO->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true)) { pGO->SetGoState(GO_STATE_ACTIVE); pPlayer->KilledMonsterCredit(NPC_SCOURGE_PRISONER, pNearestPrisoner->GetGUID()); @@ -781,7 +781,7 @@ class go_arcane_prison : public GameObjectScript public: go_arcane_prison() : GameObjectScript("go_arcane_prison") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pPlayer->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE) { @@ -804,7 +804,7 @@ class go_blood_filled_orb : public GameObjectScript public: go_blood_filled_orb() : GameObjectScript("go_blood_filled_orb") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) pPlayer->SummonCreature(NPC_ZELEMAR, -369.746f, 166.759f, -21.50f, 5.235f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -910,7 +910,7 @@ class go_inconspicuous_landmark : public GameObjectScript public: go_inconspicuous_landmark() : GameObjectScript("go_inconspicuous_landmark") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY, 1)) return false; @@ -930,13 +930,13 @@ class go_soulwell : public GameObjectScript public: go_soulwell() : GameObjectScript("go_soulwell") { } - bool OnGossipHello(Player *pPlayer, GameObject* pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { - Unit *caster = pGO->GetOwner(); + Unit* caster = pGO->GetOwner(); if (!caster || caster->GetTypeId() != TYPEID_PLAYER) return true; - if (!pPlayer->IsInSameRaidWith(static_cast<Player *>(caster))) + if (!pPlayer->IsInSameRaidWith(static_cast<Player* >(caster))) return true; // Repeating this at every use is ugly and inefficient. But as long as we don't have proper @@ -985,7 +985,7 @@ class go_dragonflayer_cage : public GameObjectScript public: go_dragonflayer_cage() : GameObjectScript("go_dragonflayer_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pPlayer->GetQuestStatus(QUEST_PRISONERS_OF_WYRMSKULL) != QUEST_STATUS_INCOMPLETE) return true; @@ -1032,11 +1032,11 @@ class go_tadpole_cage : public GameObjectScript public: go_tadpole_cage() : GameObjectScript("go_tadpole_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pPlayer->GetQuestStatus(QUEST_OH_NOES_THE_TADPOLES) == QUEST_STATUS_INCOMPLETE) { - Creature *pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE, 1.0f); + Creature* pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE, 1.0f); if (pTadpole) { pGO->UseDoorOrButton(); @@ -1067,12 +1067,12 @@ class go_black_cage : public GameObjectScript public: go_black_cage() : GameObjectScript("go_black_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if ((pPlayer->GetTeamId() == TEAM_ALLIANCE && pPlayer->GetQuestStatus(QUEST_ALLIANCE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetTeamId() == TEAM_HORDE && pPlayer->GetQuestStatus(QUEST_HORDE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE)) { - Creature *pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT, 1.0f); + Creature* pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT, 1.0f); if (!pPrisoner) pPrisoner = pGO->FindNearestCreature(NPC_KUL, 1.0f); if (pPrisoner) @@ -1110,7 +1110,7 @@ class go_amberpine_outhouse : public GameObjectScript public: go_amberpine_outhouse() : GameObjectScript("go_amberpine_outhouse") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { QuestStatus status = pPlayer->GetQuestStatus(QUEST_DOING_YOUR_DUTY); if (status == QUEST_STATUS_INCOMPLETE || status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) @@ -1124,7 +1124,7 @@ public: return true; } - bool OnGossipSelect(Player *pPlayer, GameObject *pGO, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF +1) @@ -1165,7 +1165,7 @@ class go_hive_pod : public GameObjectScript public: go_hive_pod() : GameObjectScript("go_hive_pod") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { pPlayer->SendLoot(pGO->GetGUID(), LOOT_CORPSE); pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX()+1, pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); @@ -1179,7 +1179,7 @@ class go_massive_seaforium_charge : public GameObjectScript public: go_massive_seaforium_charge() : GameObjectScript("go_massive_seaforium_charge") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGo) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) { pGo->SetLootState(GO_JUST_DEACTIVATED); return true; diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 5ff807e0e40..52b7b233f88 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -301,7 +301,7 @@ public: bool canTeleport; }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new guard_shattrath_scryerAI(creature); } @@ -365,7 +365,7 @@ public: bool canTeleport; }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new guard_shattrath_aldorAI(creature); } diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 073625943aa..440a75975ff 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -97,7 +97,7 @@ public: { if (urand(0, 99) < 35) { - Creature *Murloc = pPlayer->SummonCreature(17102, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); + Creature* Murloc = pPlayer->SummonCreature(17102, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Murloc) Murloc->AI()->AttackStart(pPlayer); } @@ -132,9 +132,9 @@ public: { if (player->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE) { - if (Creature *nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()+20, player->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000)) + if (Creature* nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()+20, player->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000)) nether->AI()->AttackStart(player); - if (Creature *nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()-20, player->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000)) + if (Creature* nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()-20, player->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000)) nether->AI()->AttackStart(player); } return false; @@ -150,7 +150,7 @@ class item_gor_dreks_ointment : public ItemScript public: item_gor_dreks_ointment() : ItemScript("item_gor_dreks_ointment") { } - bool OnUse(Player *pPlayer, Item *pItem, SpellCastTargets const& targets) + bool OnUse(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { if (targets.GetUnitTarget() && targets.GetUnitTarget()->GetTypeId() == TYPEID_UNIT && targets.GetUnitTarget()->GetEntry() == 20748 && !targets.GetUnitTarget()->HasAura(32578)) @@ -170,7 +170,7 @@ class item_incendiary_explosives : public ItemScript public: item_incendiary_explosives() : ItemScript("item_incendiary_explosives") { } - bool OnUse(Player *pPlayer, Item *pItem, SpellCastTargets const & /*targets*/) + bool OnUse(Player* pPlayer, Item* pItem, SpellCastTargets const & /*targets*/) { if (pPlayer->FindNearestCreature(26248, 15) || pPlayer->FindNearestCreature(26249, 15)) return false; @@ -190,7 +190,7 @@ class item_mysterious_egg : public ItemScript { public: item_mysterious_egg() : ItemScript("item_mysterious_egg") { } - bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) + bool OnExpire(Player* pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg @@ -210,7 +210,7 @@ class item_disgusting_jar : public ItemScript public: item_disgusting_jar() : ItemScript("item_disgusting_jar") {} - bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) + bool OnExpire(Player* pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar @@ -259,9 +259,9 @@ class item_pile_fake_furs : public ItemScript public: item_pile_fake_furs() : ItemScript("item_pile_fake_furs") { } - bool OnUse(Player *pPlayer, Item* /*pItem*/, SpellCastTargets const & /*targets*/) + bool OnUse(Player* pPlayer, Item* /*pItem*/, SpellCastTargets const & /*targets*/) { - GameObject *pGo = NULL; + GameObject* pGo = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) { pGo = pPlayer->FindNearestGameObject(CaribouTraps[i], 5.0f); diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 455615561f5..f8616c3fa5e 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -34,7 +34,7 @@ public: struct generic_creatureAI : public ScriptedAI { - generic_creatureAI(Creature *c) : ScriptedAI(c) {} + generic_creatureAI(Creature* c) : ScriptedAI(c) {} uint32 GlobalCooldown; //This variable acts like the global cooldown that players have (1.5 seconds) uint32 BuffTimer; //This variable keeps track of buffs @@ -47,7 +47,7 @@ public: IsSelfRooted = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { if (!me->IsWithinMeleeRange(who)) IsSelfRooted = true; @@ -161,7 +161,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new generic_creatureAI(creature); } @@ -197,7 +197,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new trigger_periodicAI(creature); } @@ -218,7 +218,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new trigger_deathAI(creature); } diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index e0726035e5b..e22b1d48e4c 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -42,7 +42,7 @@ class npc_innkeeper : public CreatureScript public: npc_innkeeper() : CreatureScript("npc_innkeeper") { } - bool OnGossipHello(Player *pPlayer, Creature *pCreature) + bool OnGossipHello(Player* pPlayer, Creature* pCreature) { if (IsEventActive(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED)) { diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 671892e9ef2..0d4d5cb6837 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -254,7 +254,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_air_force_botsAI(creature); } @@ -280,7 +280,7 @@ class npc_lunaclaw_spirit : public CreatureScript public: npc_lunaclaw_spirit() : CreatureScript("npc_lunaclaw_spirit") { } - bool OnGossipHello(Player *pPlayer, Creature *pCreature) + bool OnGossipHello(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_BODY_HEART_A) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_BODY_HEART_H) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GRANT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -319,7 +319,7 @@ public: struct npc_chicken_cluckAI : public ScriptedAI { - npc_chicken_cluckAI(Creature *c) : ScriptedAI(c) {} + npc_chicken_cluckAI(Creature* c) : ScriptedAI(c) {} uint32 ResetFlagTimer; @@ -372,7 +372,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_chicken_cluckAI(creature); } @@ -409,7 +409,7 @@ public: struct npc_dancing_flamesAI : public ScriptedAI { - npc_dancing_flamesAI(Creature *c) : ScriptedAI(c) {} + npc_dancing_flamesAI(Creature* c) : ScriptedAI(c) {} bool active; uint32 can_iteract; @@ -472,7 +472,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_dancing_flamesAI(creature); } @@ -552,7 +552,7 @@ public: struct npc_doctorAI : public ScriptedAI { - npc_doctorAI(Creature *c) : ScriptedAI(c) {} + npc_doctorAI(Creature* c) : ScriptedAI(c) {} uint64 PlayerGUID; @@ -680,7 +680,7 @@ public: return true; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_doctorAI(creature); } @@ -697,7 +697,7 @@ public: struct npc_injured_patientAI : public ScriptedAI { - npc_injured_patientAI(Creature *c) : ScriptedAI(c) {} + npc_injured_patientAI(Creature* c) : ScriptedAI(c) {} uint64 Doctorguid; Location* Coord; @@ -737,7 +737,7 @@ public: void EnterCombat(Unit* /*who*/){} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (caster->GetTypeId() == TYPEID_PLAYER && me->isAlive() && spell->Id == 20804) { @@ -800,7 +800,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_injured_patientAI(creature); } @@ -899,7 +899,7 @@ public: struct npc_garments_of_questsAI : public npc_escortAI { - npc_garments_of_questsAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_garments_of_questsAI(Creature* c) : npc_escortAI(c) {Reset();} uint64 caster; @@ -1044,7 +1044,7 @@ public: { if (RunAwayTimer <= diff) { - if (Unit *pUnit = Unit::GetUnit(*me, caster)) + if (Unit* pUnit = Unit::GetUnit(*me, caster)) { switch(me->GetEntry()) { @@ -1068,7 +1068,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_garments_of_questsAI(creature); } @@ -1087,7 +1087,7 @@ public: struct npc_guardianAI : public ScriptedAI { - npc_guardianAI(Creature *c) : ScriptedAI(c) {} + npc_guardianAI(Creature* c) : ScriptedAI(c) {} void Reset() { @@ -1111,7 +1111,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_guardianAI(creature); } @@ -1504,7 +1504,7 @@ public: struct npc_steam_tonkAI : public ScriptedAI { - npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {} + npc_steam_tonkAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} @@ -1525,7 +1525,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_steam_tonkAI(creature); } @@ -1540,7 +1540,7 @@ public: struct npc_tonk_mineAI : public ScriptedAI { - npc_tonk_mineAI(Creature *c) : ScriptedAI(c) + npc_tonk_mineAI(Creature* c) : ScriptedAI(c) { me->SetReactState(REACT_PASSIVE); } @@ -1567,7 +1567,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_tonk_mineAI(creature); } @@ -1595,7 +1595,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_brewfest_revelerAI(creature); } @@ -1635,7 +1635,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_winter_revelerAI(creature); } @@ -1663,7 +1663,7 @@ public: struct npc_snake_trap_serpentsAI : public ScriptedAI { - npc_snake_trap_serpentsAI(Creature *c) : ScriptedAI(c) {} + npc_snake_trap_serpentsAI(Creature* c) : ScriptedAI(c) {} uint32 SpellTimer; bool IsViper; @@ -1695,7 +1695,7 @@ public: } //Redefined for random target selection: - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who)) && who->isInAccessiblePlaceFor(me)) { @@ -1748,7 +1748,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_snake_trap_serpentsAI(creature); } @@ -1771,7 +1771,7 @@ public: struct mob_mojoAI : public ScriptedAI { - mob_mojoAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_mojoAI(Creature* c) : ScriptedAI(c) {Reset();} uint32 hearts; uint64 victimGUID; void Reset() @@ -1833,7 +1833,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_mojoAI(creature); } @@ -1846,7 +1846,7 @@ public: struct npc_mirror_imageAI : CasterAI { - npc_mirror_imageAI(Creature *c) : CasterAI(c) {} + npc_mirror_imageAI(Creature* c) : CasterAI(c) {} void InitializeAI() { @@ -1868,7 +1868,7 @@ public: if (me->IsInEvadeMode() || !me->isAlive()) return; - Unit *owner = me->GetCharmerOrOwner(); + Unit* owner = me->GetCharmerOrOwner(); me->CombatStop(true); if (owner && !me->HasUnitState(UNIT_STAT_FOLLOW)) @@ -1879,7 +1879,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_mirror_imageAI(creature); } @@ -1892,7 +1892,7 @@ public: struct npc_ebon_gargoyleAI : CasterAI { - npc_ebon_gargoyleAI(Creature *c) : CasterAI(c) {} + npc_ebon_gargoyleAI(Creature* c) : CasterAI(c) {} uint32 despawnTimer; @@ -1920,17 +1920,17 @@ public: void JustDied(Unit* /*killer*/) { // Stop Feeding Gargoyle when it dies - if (Unit *owner = me->GetOwner()) + if (Unit* owner = me->GetOwner()) owner->RemoveAurasDueToSpell(50514); } // Fly away when dismissed - void SpellHit(Unit *source, const SpellEntry *spell) + void SpellHit(Unit* source, const SpellEntry *spell) { if (spell->Id != 50515 || !me->isAlive()) return; - Unit *owner = me->GetOwner(); + Unit* owner = me->GetOwner(); if (!owner || owner != source) return; @@ -1971,7 +1971,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_ebon_gargoyleAI(creature); } @@ -1984,7 +1984,7 @@ public: struct npc_lightwellAI : public PassiveAI { - npc_lightwellAI(Creature *c) : PassiveAI(c) {} + npc_lightwellAI(Creature* c) : PassiveAI(c) {} void Reset() { @@ -1992,7 +1992,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_lightwellAI(creature); } @@ -2117,7 +2117,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_shadowfiendAI(creature); } |