diff options
18 files changed, 33 insertions, 28 deletions
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index c0f09918c24..ebb4c045f3f 100755 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -146,7 +146,7 @@ public: explicit PacketFilter(WorldSession * pSession) : m_pSession(pSession) {} virtual ~PacketFilter() {} - virtual bool Process(WorldPacket * packet) { return true; } + virtual bool Process(WorldPacket * /*packet*/) { return true; } virtual bool ProcessLogout() const { return true; } protected: diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index b0f30078445..736cab08caa 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -113,7 +113,7 @@ public: } } - uint32 GetData(uint32 uiType, uint32 /*uiData*/) + uint32 GetData(uint32 uiType) { switch(uiType) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 983fd44f5de..7f03d3cb610 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -63,7 +63,7 @@ class boss_netherspite : public CreatureScript public: boss_netherspite() : CreatureScript("boss_netherspite") { } - CreatureAI* GetAI(Creature *pCreature) + CreatureAI* GetAI(Creature *pCreature) const { return new boss_netherspiteAI(pCreature); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 05fd6881d85..9ba36803af7 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -662,7 +662,7 @@ public: for (uint8 i = 0; i < 4; ++i) { float x,y,z; - Unit *pTarget; + Unit *pTarget = NULL; for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); @@ -748,7 +748,7 @@ public: case TIMER_LEGION_LIGHTNING: if (!me->IsNonMeleeSpellCasted(false)) { - Unit* pRandomPlayer; + Unit* pRandomPlayer = NULL; me->RemoveAurasDueToSpell(SPELL_SOUL_FLAY); for (uint8 z = 0; z < 6; ++z) @@ -844,7 +844,7 @@ public: TimerIsDeactivated[TIMER_ORBS_EMPOWER] = true; break; case TIMER_ARMAGEDDON: //Phase 4 - Unit *pTarget; + Unit *pTarget = NULL; for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp index 75a0084d12c..bd045102aca 100644 --- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp +++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp @@ -70,7 +70,7 @@ public: { } - void KilledUnit() + void KilledUnit(Unit* /*victim*/) { // When a player, pet or totem gets killed, Lord Kazzak casts this spell to instantly regenerate 70,000 health. DoCast(me, SPELL_CAPTURESOUL); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index 1b66ec70698..40a801526e0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -73,7 +73,10 @@ public: struct instance_dark_portal_InstanceMapScript : public InstanceScript { - instance_dark_portal_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();}; + instance_dark_portal_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + { + Initialize(); + } uint32 m_auiEncounter[MAX_ENCOUNTER]; @@ -114,7 +117,7 @@ public: DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); } - bool IsEncounterInProgress() + bool IsEncounterInProgress() const { if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return true; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 6017aa3f91f..26c48ca8bf0 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -72,7 +72,7 @@ public: DoScriptText(SAY_AGGRO, me); } - void KilledUnit() + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_KILL, me); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index d4e7758ca3a..87a9b322be3 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -268,7 +268,7 @@ public: return NULL; } - Unit* GetAuraEffectTriggerTarget(uint32 spellId, uint8 /*effIndex*/) const + Unit* GetAuraEffectTriggerTarget(uint32 spellId, uint8 /*effIndex*/) { switch (spellId) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 158e19843d9..e22a372fd39 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -323,7 +323,7 @@ public: nWeaver = 0; } - void KilledUnit() + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 1e0e98fa550..5ac7ef1db8f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -788,7 +788,7 @@ public: { } - void JustDied() + void JustDied(Unit* /*killer*/) { float x,y,z; me->GetPosition(x,y,z); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 9d2a3178bab..07820dc2919 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -436,7 +436,7 @@ public: void SpawnTrigger() { - uint8 iStart,iEnd; + uint8 iStart = 0, iEnd = 0; switch (urand(0,1)) { case 0: @@ -447,9 +447,11 @@ public: iStart = 38; iEnd = 68; break; + default: + break; } - for(uint32 i = iStart; i < iEnd; ++i) - me->SummonCreature(CREATURE_TRIGGER,Location[i]); + for (uint32 i = iStart; i < iEnd; ++i) + me->SummonCreature(CREATURE_TRIGGER, Location[i]); } }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index ccb24a956ed..609333bd8d3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -232,7 +232,7 @@ public: } // called by svala sorrowgrave to set guid of victim - void DoAction(uint32 /*action*/) + void DoAction(const int32 /*action*/) { if (pInstance) if (Unit *pVictim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER))) diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 5c5ea193cce..ce462b96f9e 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -2418,11 +2418,11 @@ public: me->RestoreFaction(); } - void DoAction(const int32 iParam) + void DoAction(const int32 /*iParam*/) { me->StopMoving(); - me->SetUInt32Value(UNIT_NPC_FLAGS,0); - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + me->SetUInt32Value(UNIT_NPC_FLAGS, 0); + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) { me->SetInFront(pPlayer); me->SendMovementFlagUpdate(); @@ -2431,7 +2431,7 @@ public: uiEventPhase = 1; } - void SetGUID(const uint64 &uiGuid, int32 iId) + void SetGUID(const uint64 &uiGuid, int32 /*iId*/) { uiPlayerGUID = uiGuid; } @@ -2546,7 +2546,7 @@ public: return true; } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 0d4751863d6..67f37135d50 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -419,12 +419,12 @@ public: me->SummonCreature(uiEntry, afSummon[0], afSummon[1], afSummon[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30*IN_MILLISECONDS); } - void SummonedCreatureDies(Creature* pSummoned, Unit* pKiller) + void SummonedCreatureDies(Creature* pSummoned, Unit* /*pKiller*/) { uint32 uiEntry = 0; // will eventually reset the event if something goes wrong - switch(pSummoned->GetEntry()) + switch (pSummoned->GetEntry()) { case NPC_FIRJUS: uiEntry = NPC_JLARBORN; break; case NPC_JLARBORN: uiEntry = NPC_YOROS; break; diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 62839f0df2a..b8a58fbe92b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -279,7 +279,7 @@ public: void MoveInLineOfSight(Unit * /*who*/) {} - void DoAction(const uint32 /*info*/) + void DoAction(const int32 /*info*/) { me->RemoveAura(SPELL_VOLCANIC_ERUPTION); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index c4530ddb663..a809dd933c5 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -104,7 +104,7 @@ public: pInstance->SetData(DATA_GRUULEVENT, IN_PROGRESS); } - void KilledUnit() + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 565ed6b96d7..9e1fce33c8d 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -168,7 +168,7 @@ public: pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void KilledUnit() + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index d6e049852ed..a62941ef49c 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -430,7 +430,7 @@ class boss_kaelthas : public CreatureScript StartEvent(); } - void KilledUnit() + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } |