diff options
Diffstat (limited to 'src/server/scripts')
11 files changed, 31 insertions, 31 deletions
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 3621ad1567b..ef0be865853 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -151,7 +151,7 @@ class boss_archaedas : public CreatureScript return; // wake a wall minion - if (uiWallMinionTimer <= uiDiff) + if (uiWallMinionTimer <= uiDiff) { pInstance->SetData (DATA_MINIONS, IN_PROGRESS); @@ -159,7 +159,7 @@ class boss_archaedas : public CreatureScript } else uiWallMinionTimer -= uiDiff; //If we are <66 summon the guardians - if (!bGuardiansAwake && !HealthAbovePct(66)) + if (!bGuardiansAwake && !HealthAbovePct(66)) { ActivateMinion(pInstance->GetData64(5),true); // EarthenGuardian1 ActivateMinion(pInstance->GetData64(6),true); // EarthenGuardian2 @@ -196,7 +196,7 @@ class boss_archaedas : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied (Unit * /*pKiller*/) + void JustDied (Unit * /*pKiller*/) { if (pInstance) { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index e8820ba5e18..0b2a1d1f980 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -130,7 +130,7 @@ class instance_uldaman : public InstanceMapScript case GO_IRONAYA_SEAL_DOOR: uiIronayaSealDoor = go->GetGUID(); - if (m_auiEncounter[2] == DONE) + if (m_auiEncounter[2] == DONE) HandleGameObject(NULL, true, go); break; @@ -353,7 +353,7 @@ class instance_uldaman : public InstanceMapScript switch(data) { case NOT_STARTED: - if (m_auiEncounter[0] == DONE) //if players opened the doors + if (m_auiEncounter[0] == DONE) //if players opened the doors SetDoor(uiArchaedasTempleDoor, true); RespawnMinions(); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index cd119522d51..4d2ee390f67 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -163,7 +163,7 @@ enum eDeserter const Position DeserterDisappearPos = {-3609.03f, -4332.91f, 9.39354f, 3.73862f}; -#define GOSSIP_ITEM_DESERTER "Your propaganda wont`t work on me. Spout your treasonous filth elsewhere traitor!" +#define GOSSIP_ITEM_DESERTER "Your propaganda wont`t work on me. Spout your treasonous filth elsewhere traitor!" class npc_deserter_agitator : public CreatureScript { @@ -174,7 +174,7 @@ public: { if (pPlayer->GetQuestStatus(QUEST_TRAITORS_AMONG_US) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DESERTER, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); - + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); return true; @@ -183,7 +183,7 @@ public: bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); - + if (uiAction == GOSSIP_SENDER_INFO) { pPlayer->CLOSE_GOSSIP_MENU(); @@ -272,7 +272,7 @@ public: { if (pPlayer->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); - + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); return true; @@ -281,7 +281,7 @@ public: bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); - + if (uiAction == GOSSIP_SENDER_INFO) { pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 7e563aba735..154b814f3bb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -70,7 +70,7 @@ enum eShadowmourne SPELL_THIRST_QUENCHED = 72154, }; -static const uint32 vampireAuras[3][MAX_DIFFICULTY] = +static const uint32 vampireAuras[3][MAX_DIFFICULTY] = { {70867, 71473, 71532, 71533}, {70879, 71525, 71530, 71531}, @@ -468,7 +468,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader { GetCaster()->CastSpell(GetCaster(), SPELL_THIRST_QUENCHED, true); GetCaster()->RemoveAura(aura); - } + } else GetCaster()->CastSpell(GetCaster(), SPELL_GUSHING_WOUND, true); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 49198ae8252..a38a499a109 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -992,7 +992,7 @@ class spell_putricide_choking_gas_bomb : public SpellScriptLoader { if (i == skipIndex) continue; - + uint32 spellId = SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), uint8(i)); GetCaster()->CastSpell(GetCaster(), spellId, true, NULL, NULL, GetCaster()->GetGUID()); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index b316424987b..8351b1b0b5c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -369,7 +369,7 @@ class npc_big_ooze : public CreatureScript break; } } - + if (me->IsVisible()) DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 55ed9e10348..5c5ea193cce 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -2497,7 +2497,7 @@ public: uiEventPhase = 0; } break; - } + } }else uiEventTimer -= uiDiff; if (!UpdateVictim()) @@ -2559,12 +2559,12 @@ public: if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); - + return true; } }; - + void AddSC_borean_tundra() { new npc_sinkhole_kill_credit; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index 9649c73b800..e9a0d2c4701 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -651,7 +651,7 @@ public: struct npc_lightning_sentryAI : public ScriptedAI { npc_lightning_sentryAI(Creature *pCreature) : ScriptedAI(pCreature) { } - + uint32 uiChargedSentryTotem; void Reset() @@ -709,7 +709,7 @@ class npc_venture_co_straggler : public CreatureScript { public: npc_venture_co_straggler() : CreatureScript("npc_venture_co_straggler") { } - + CreatureAI *GetAI(Creature *pCreature) const { return new npc_venture_co_stragglerAI(pCreature); @@ -742,7 +742,7 @@ public: switch (uiTimer) { case 0: - if (pPlayer->GetQuestStatus(QUEST_SMOKE_EM_OUT_A) == QUEST_STATUS_INCOMPLETE || + if (pPlayer->GetQuestStatus(QUEST_SMOKE_EM_OUT_A) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_SMOKE_EM_OUT_H) == QUEST_STATUS_INCOMPLETE) pPlayer->KilledMonsterCredit(NPC_VENTURE_CO_STABLES_KC, 0); me->GetMotionMaster()->MovePoint(0, me->GetPositionX()-7, me->GetPositionY()+7, me->GetPositionZ()); diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index d6d9e81175a..0d4751863d6 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -356,13 +356,13 @@ enum eDaegarnn }; static float afSummon[] = {838.81f, -4678.06f, -94.182f}; -static float afCenter[] = {801.88f, -4721.87f, -96.143f}; +static float afCenter[] = {801.88f, -4721.87f, -96.143f}; class npc_daegarn : public CreatureScript { public: npc_daegarn() : CreatureScript("npc_daegarn") { } - + bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_DEFEAT_AT_RING) @@ -373,10 +373,10 @@ public: return true; } - + // TODO: make prisoners help (unclear if summoned or using npc's from surrounding cages (summon inside small cages?)) - struct npc_daegarnAI : public ScriptedAI - { + struct npc_daegarnAI : public ScriptedAI + { npc_daegarnAI(Creature *pCreature) : ScriptedAI(pCreature) { } bool bEventInProgress; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 7ffb14f3797..962eca6506e 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -575,7 +575,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) AddCreature(EP_PWT_FLIGHTMASTER,EP_PWT_FlightMaster.entry,team,EP_PWT_FlightMaster.map,EP_PWT_FlightMaster.x,EP_PWT_FlightMaster.y,EP_PWT_FlightMaster.z,EP_PWT_FlightMaster.o); /* // sky - we need update gso code - + Creature * c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]); //Spawn flight master as friendly to capturing team c->SetUInt32Value(GAMEOBJECT_FACTION,(team == ALLIANCE ? 55 : 68)); diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index cdd86ce2751..d65874068df 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -30,7 +30,7 @@ enum ShamanSpells SHAMAN_SPELL_MANA_TIDE_TOTEM = 39609, SHAMAN_SPELL_FIRE_NOVA_R1 = 1535, SHAMAN_SPELL_FIRE_NOVA_TRIGGERED_R1 = 8349, - + //For Earthen Power SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM = 6474, //Spell casted by totem SHAMAN_TOTEM_SPELL_EARTHEN_POWER = 59566,//Spell witch remove snare effect @@ -135,7 +135,7 @@ public: } }; -// 6474 - Earthbind Totem - Fix Talent:Earthen Power +// 6474 - Earthbind Totem - Fix Talent:Earthen Power class spell_sha_earthbind_totem : public SpellScriptLoader { public: @@ -143,11 +143,11 @@ public: class spell_sha_earthbind_totem_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_earthbind_totem_AuraScript); - + PrepareAuraScript(spell_sha_earthbind_totem_AuraScript); + bool Validate(SpellEntry const * /*spellEntry*/) { - if (!sSpellStore.LookupEntry(SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM)) + if (!sSpellStore.LookupEntry(SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM)) return false; if (!sSpellStore.LookupEntry(SHAMAN_TOTEM_SPELL_EARTHEN_POWER)) return false; |