diff options
Diffstat (limited to 'src/scripts')
-rw-r--r-- | src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp | 2 | ||||
-rw-r--r-- | src/scripts/northrend/borean_tundra.cpp | 4 | ||||
-rw-r--r-- | src/scripts/northrend/crystalsong_forest.cpp | 2 | ||||
-rw-r--r-- | src/scripts/northrend/vault_of_archavon/boss_toravon.cpp | 2 | ||||
-rw-r--r-- | src/scripts/world/go_scripts.cpp | 2 | ||||
-rw-r--r-- | src/scripts/world/item_scripts.cpp | 4 | ||||
-rw-r--r-- | src/scripts/world/npcs_special.cpp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index 9cbc514b468..4863bdcb032 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -198,7 +198,7 @@ struct boss_krik_thirAI : public ScriptedAI pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_NARJIL)); if (!pAdd || !pAdd->isAlive()) return; - + pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE); } diff --git a/src/scripts/northrend/borean_tundra.cpp b/src/scripts/northrend/borean_tundra.cpp index 728e065e14a..e57e00f5554 100644 --- a/src/scripts/northrend/borean_tundra.cpp +++ b/src/scripts/northrend/borean_tundra.cpp @@ -648,7 +648,7 @@ enum eNesingwaryTrapper }; #define CaribouTrapsNum 15 -const uint32 CaribouTraps[CaribouTrapsNum] = +const uint32 CaribouTraps[CaribouTrapsNum] = { GO_CARIBOU_TRAP_1, GO_CARIBOU_TRAP_2, GO_CARIBOU_TRAP_3, GO_CARIBOU_TRAP_4, GO_CARIBOU_TRAP_5, GO_CARIBOU_TRAP_6, GO_CARIBOU_TRAP_7, GO_CARIBOU_TRAP_8, GO_CARIBOU_TRAP_9, GO_CARIBOU_TRAP_10, @@ -2084,7 +2084,7 @@ struct npc_trapped_mammoth_calfAI : public ScriptedAI void MovementInform(uint32 uiType, uint32 /*uiId*/) { - + if (uiType != POINT_MOTION_TYPE) return; me->DisappearAndDie(); diff --git a/src/scripts/northrend/crystalsong_forest.cpp b/src/scripts/northrend/crystalsong_forest.cpp index 22e2ae1e091..208e9dea5b5 100644 --- a/src/scripts/northrend/crystalsong_forest.cpp +++ b/src/scripts/northrend/crystalsong_forest.cpp @@ -87,7 +87,7 @@ struct npc_warmage_violetstandAI : public Scripted_NoMovementAI uiTargetGUID = pOrb->GetGUID(); } - + if (Creature* pOrb = me->GetCreature(*me,uiTargetGUID)) DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); diff --git a/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp b/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp index 092339be6d5..2e16f9211d2 100644 --- a/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp +++ b/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp @@ -243,7 +243,7 @@ struct mob_frozen_orb_stalkerAI : public Scripted_NoMovementAI Unit* pToravon = me->GetCreature(*me, pInstance->GetData64(DATA_TORAVON)); if (!pToravon) return; - + uint8 num_orbs = RAID_MODE(1, 3); for (uint8 i=0; i<num_orbs; ++i) { diff --git a/src/scripts/world/go_scripts.cpp b/src/scripts/world/go_scripts.cpp index 28ba7b47e97..3f822266eb9 100644 --- a/src/scripts/world/go_scripts.cpp +++ b/src/scripts/world/go_scripts.cpp @@ -1097,7 +1097,7 @@ void AddSC_go_scripts() newscript->Name = "go_stillpine_cage"; newscript->pGOHello = &GOHello_go_stillpine_cage; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "go_amberpine_outhouse"; newscript->pGOHello = &GOHello_go_amberpine_outhouse; diff --git a/src/scripts/world/item_scripts.cpp b/src/scripts/world/item_scripts.cpp index 241f6020caa..49294213d91 100644 --- a/src/scripts/world/item_scripts.cpp +++ b/src/scripts/world/item_scripts.cpp @@ -255,7 +255,7 @@ enum ePileFakeFur }; #define CaribouTrapsNum 15 -const uint32 CaribouTraps[CaribouTrapsNum] = +const uint32 CaribouTraps[CaribouTrapsNum] = { GO_CARIBOU_TRAP_1, GO_CARIBOU_TRAP_2, GO_CARIBOU_TRAP_3, GO_CARIBOU_TRAP_4, GO_CARIBOU_TRAP_5, GO_CARIBOU_TRAP_6, GO_CARIBOU_TRAP_7, GO_CARIBOU_TRAP_8, GO_CARIBOU_TRAP_9, GO_CARIBOU_TRAP_10, @@ -383,7 +383,7 @@ bool ItemUse_item_dehta_trap_smasher(Player* pPlayer, Item* /*pItem*/, const Spe pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF,0); return true; } - } + } return false; } diff --git a/src/scripts/world/npcs_special.cpp b/src/scripts/world/npcs_special.cpp index c7c2d4a68ee..47bb0893d6a 100644 --- a/src/scripts/world/npcs_special.cpp +++ b/src/scripts/world/npcs_special.cpp @@ -2081,7 +2081,7 @@ bool GossipHello_npc_pet_trainer(Player* pPlayer, Creature* pCreature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (pPlayer->GetPet() && pPlayer->GetPet()->getPetType() == HUNTER_PET) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - + pPlayer->PlayerTalkClass->SendGossipMenu(TEXT_ISHUNTER, pCreature->GetGUID()); return true; } |