diff options
549 files changed, 2082 insertions, 2122 deletions
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index ddcd1b35d79..7abdc06affb 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -258,7 +258,6 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) sLog.outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) have data for not supported data type (%u), ignore.", criteria->ID, criteria->requiredType,dataType); return false; } - return false; } bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Unit const* target, uint32 miscvalue1 /*= 0*/) const diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp index 6ffecaf3a64..b2d7f80451c 100644 --- a/src/game/AuctionHouseBot.cpp +++ b/src/game/AuctionHouseBot.cpp @@ -185,11 +185,11 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config) uint32 purpleIcount = config->GetPercents(AHB_PURPLE_I); uint32 orangeIcount = config->GetPercents(AHB_ORANGE_I); uint32 yellowIcount = config->GetPercents(AHB_YELLOW_I); - uint32 total = greyTGcount + whiteTGcount + greenTGcount + blueTGcount +/* uint32 total = greyTGcount + whiteTGcount + greenTGcount + blueTGcount + purpleTGcount + orangeTGcount + yellowTGcount + whiteIcount + greenIcount + blueIcount + purpleIcount + orangeIcount + yellowIcount; - +*/ uint32 greyTGoods = config->GetItemCounts(AHB_GREY_TG); uint32 whiteTGoods = config->GetItemCounts(AHB_WHITE_TG); uint32 greenTGoods = config->GetItemCounts(AHB_GREEN_TG); @@ -1434,7 +1434,7 @@ void AuctionHouseBot::DecrementItemCounts(AuctionEntry* ah, uint32 item_template void AuctionHouseBot::Commands(uint32 command, uint32 ahMapID, uint32 col, char* args) { - AHBConfig *config; + AHBConfig *config = NULL; switch (ahMapID) { case 2: @@ -1751,7 +1751,7 @@ void AuctionHouseBot::LoadValues(AHBConfig *config) sLog.outString("maxStackOrange = %u", config->GetMaxStack(AHB_ORANGE)); sLog.outString("maxStackYellow = %u", config->GetMaxStack(AHB_YELLOW)); } - AuctionHouseEntry const* ahEntry = auctionmgr.GetAuctionHouseEntry(config->GetAHFID()); + //AuctionHouseEntry const* ahEntry = auctionmgr.GetAuctionHouseEntry(config->GetAHFID()); AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(config->GetAHFID()); config->ResetItemCounts(); diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index fbba3cc89ec..288a3d5d345 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -1474,7 +1474,7 @@ void BattleGround::RemovePlayerFromResurrectQueue(uint64 player_guid) } } -bool BattleGround::AddObject(uint32 type, uint32 entry, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime) +bool BattleGround::AddObject(uint32 type, uint32 entry, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3, uint32 /*respawnTime*/) { Map *map = GetBgMap(); if (!map) @@ -1600,7 +1600,7 @@ void BattleGround::SpawnBGObject(uint32 type, uint32 respawntime) } } -Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, float x, float y, float z, float o, uint32 respawntime) +Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, float x, float y, float z, float o, uint32 /*respawntime*/) { Map * map = GetBgMap(); if (!map) @@ -1901,7 +1901,7 @@ int32 BattleGround::GetObjectType(uint64 guid) return -1; } -void BattleGround::HandleKillUnit(Creature *creature, Player *killer) +void BattleGround::HandleKillUnit(Creature * /*creature*/, Player * /*killer*/) { } diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index ce3efdcecb4..e857e4b7e5b 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -500,8 +500,8 @@ class BattleGround virtual void EventPlayerCapturedFlag(Player* /*player*/) {} void EventPlayerLoggedIn(Player* player, uint64 plr_guid); void EventPlayerLoggedOut(Player* player); - virtual void EventPlayerDamagedGO(Player* /*player*/, GameObject* /*target_obj*/, uint32 /*eventId*/) {} - virtual void EventPlayerUsedGO(Player* player, GameObject* go){} + virtual void EventPlayerDamagedGO(Player* /*player*/, GameObject* /*target_obj*/, uint32 /*eventId*/) {} + virtual void EventPlayerUsedGO(Player* /*player*/, GameObject* /*go*/){} /* Death related */ virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player); diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp index b5ff57ef29f..8c7277bdbd8 100644 --- a/src/game/BattleGroundAV.cpp +++ b/src/game/BattleGroundAV.cpp @@ -708,9 +708,7 @@ void BattleGroundAV::PopulateNode(BG_AV_Nodes node) } for (uint8 i=0; i<4; i++) - { - Creature* cr = AddAVCreature(creatureid,c_place+i); - } + AddAVCreature(creatureid,c_place+i); } void BattleGroundAV::DePopulateNode(BG_AV_Nodes node) { diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index 2a834295fef..828c71bee4c 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -77,7 +77,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data) uint32 instanceId; uint8 joinAsGroup; bool isPremade = false; - Group * grp; + Group * grp = NULL; recv_data >> guid; // battlemaster guid recv_data >> bgTypeId_; // battleground type id (DBC id) @@ -134,6 +134,18 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data) // check if has free queue slots if (!_player->HasFreeBattleGroundQueueId()) return; + BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId]; + + GroupQueueInfo * ginfo = bgQueue.AddGroup(_player, NULL, bgTypeId, bracketEntry, 0, false, isPremade, 0); + uint32 avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId()); + // already checked if queueSlot is valid, now just get it + uint32 queueSlot = _player->AddBattleGroundQueueId(bgQueueTypeId); + + WorldPacket data; + // send status packet (in queue) + sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, ginfo->ArenaType); + SendPacket(&data); + sLog.outDebug("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,_player->GetGUIDLow(), _player->GetName()); } else { @@ -145,13 +157,8 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data) return; err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, 0, bg->GetMaxPlayersPerTeam(), false, 0); isPremade = (grp->GetMembersCount() >= bg->GetMinPlayersPerTeam()); - } - // if we're here, then the conditions to join a bg are met. We can proceed in joining. - // _player->GetGroup() was already checked, grp is already initialized - BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId]; - if (joinAsGroup /* && _player->GetGroup()*/) - { + BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId]; GroupQueueInfo * ginfo; uint32 avgTime; @@ -187,19 +194,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data) sLog.outDebug("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,member->GetGUIDLow(), member->GetName()); } sLog.outDebug("Battleground: group end"); - } - else - { - GroupQueueInfo * ginfo = bgQueue.AddGroup(_player, NULL, bgTypeId, bracketEntry, 0, false, isPremade, 0); - uint32 avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId()); - // already checked if queueSlot is valid, now just get it - uint32 queueSlot = _player->AddBattleGroundQueueId(bgQueueTypeId); - WorldPacket data; - // send status packet (in queue) - sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, ginfo->ArenaType); - SendPacket(&data); - sLog.outDebug("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,_player->GetGUIDLow(), _player->GetName()); } sBattleGroundMgr.ScheduleQueueUpdate(0, 0, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId()); } diff --git a/src/game/BattleGroundIC.cpp b/src/game/BattleGroundIC.cpp index 5d503460670..3d8cd76e459 100644 --- a/src/game/BattleGroundIC.cpp +++ b/src/game/BattleGroundIC.cpp @@ -102,7 +102,7 @@ void BattleGroundIC::SpawnLeader(uint32 teamid) AddCreature(34922, 1, HORDE, 1264.42f, -766.80f, 48.91f, 3.28f, 10*MINUTE); } -void BattleGroundIC::HandleKillUnit(Creature *unit, Player *killer) +void BattleGroundIC::HandleKillUnit(Creature *unit, Player * /*killer*/) { if (GetStatus() != STATUS_IN_PROGRESS) return; @@ -124,7 +124,8 @@ void BattleGroundIC::EndBattleGround(uint32 winner) { BattleGround::EndBattleGround(winner); } -void BattleGroundIC::EventPlayerClickedOnFlag(Player *source, GameObject* /*target_obj*/) + +void BattleGroundIC::EventPlayerClickedOnFlag(Player * /*source*/, GameObject* /*target_obj*/) { if (GetStatus() != STATUS_IN_PROGRESS) return; diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp index 8eb1b72f3e4..d11076bab4a 100644 --- a/src/game/BattleGroundSA.cpp +++ b/src/game/BattleGroundSA.cpp @@ -420,7 +420,7 @@ void BattleGroundSA::TeleportPlayers() } } -void BattleGroundSA::EventPlayerDamagedGO(Player* plr, GameObject* go, uint32 event) +void BattleGroundSA::EventPlayerDamagedGO(Player* plr, GameObject* /*go*/, uint32 event) { switch(event) { @@ -565,7 +565,7 @@ void BattleGroundSA::SendTime() UpdateWorldState(BG_SA_TIMER_SEC_DECS, ((end_of_round%60000)%10000)/1000); } -void BattleGroundSA::EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj) +void BattleGroundSA::EventPlayerClickedOnFlag(Player * /*Source*/, GameObject* target_obj) { switch(target_obj->GetEntry()) { diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp index f33a87e7c45..71134149618 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -443,7 +443,7 @@ void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target return; int32 message_id = 0; - ChatMsg type; + ChatMsg type = CHAT_MSG_BG_SYSTEM_NEUTRAL; //alliance flag picked up from base if (Source->GetTeam() == HORDE && this->GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_BASE diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp index d1a0b080561..f6679c5d5ac 100644 --- a/src/game/CalendarHandler.cpp +++ b/src/game/CalendarHandler.cpp @@ -25,7 +25,7 @@ #include "Opcodes.h" #include "Player.h" -void WorldSession::HandleCalendarGetCalendar(WorldPacket &recv_data) +void WorldSession::HandleCalendarGetCalendar(WorldPacket & /*recv_data*/) { sLog.outDebug("WORLD: CMSG_CALENDAR_GET_CALENDAR"); // empty diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index 38e5d53c85c..5cf46617ac2 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -431,7 +431,6 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set) return; } - PlayerInfo inf = players[newp->GetGUID()]; if (p == m_ownerGUID && newp->GetGUID() == m_ownerGUID && mod) return; diff --git a/src/game/CombatAI.cpp b/src/game/CombatAI.cpp index 738aaee15ea..5f1b21e0da2 100644 --- a/src/game/CombatAI.cpp +++ b/src/game/CombatAI.cpp @@ -39,22 +39,22 @@ void AggressorAI::UpdateAI(const uint32 /*diff*/) } // some day we will delete these useless things -int CombatAI::Permissible(const Creature *creature) +int CombatAI::Permissible(const Creature * /*creature*/) { return PERMIT_BASE_NO; } -int ArchorAI::Permissible(const Creature *creature) +int ArchorAI::Permissible(const Creature * /*creature*/) { return PERMIT_BASE_NO; } -int TurretAI::Permissible(const Creature *creature) +int TurretAI::Permissible(const Creature * /*creature*/) { return PERMIT_BASE_NO; } -int AOEAI::Permissible(const Creature *creature) +int AOEAI::Permissible(const Creature * /*creature*/) { return PERMIT_BASE_NO; } @@ -204,7 +204,7 @@ void ArchorAI::AttackStart(Unit *who) me->GetMotionMaster()->MoveIdle(); } -void ArchorAI::UpdateAI(const uint32 diff) +void ArchorAI::UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -229,7 +229,7 @@ TurretAI::TurretAI(Creature *c) : CreatureAI(c) me->m_SightDistance = me->m_CombatDistance; } -bool TurretAI::CanAIAttack(const Unit *who) const +bool TurretAI::CanAIAttack(const Unit * /*who*/) const { // TODO: use one function to replace it if (!me->IsWithinCombatRange(me->getVictim(), me->m_CombatDistance) @@ -244,7 +244,7 @@ void TurretAI::AttackStart(Unit *who) me->Attack(who, false); } -void TurretAI::UpdateAI(const uint32 diff) +void TurretAI::UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -267,16 +267,16 @@ AOEAI::AOEAI(Creature *c) : CreatureAI(c) me->SetDisplayId(11686);//invisible model,around a size of a player } -bool AOEAI::CanAIAttack(const Unit *who) const +bool AOEAI::CanAIAttack(const Unit * /*who*/) const { return false; } -void AOEAI::AttackStart(Unit *who) +void AOEAI::AttackStart(Unit * /*who*/) { } -void AOEAI::UpdateAI(const uint32 diff) +void AOEAI::UpdateAI(const uint32 /*diff*/) { if (!me->HasAura(me->m_spells[0])) me->CastSpell(me, me->m_spells[0],false); diff --git a/src/game/CombatAI.h b/src/game/CombatAI.h index 6ab92e68f38..ee13180f9b5 100644 --- a/src/game/CombatAI.h +++ b/src/game/CombatAI.h @@ -60,7 +60,7 @@ class CasterAI : public CombatAI void InitializeAI(); void AttackStart(Unit * victim) { AttackStartCaster(victim, m_attackDist); } void UpdateAI(const uint32 diff); - void EnterCombat(Unit *who); + void EnterCombat(Unit * /*who*/); private: float m_attackDist; }; diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 66400709036..6ae8a97504c 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -263,7 +263,7 @@ void Creature::RemoveCorpse() /** * change the entry of creature until respawn */ -bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data) +bool Creature::InitEntry(uint32 Entry, uint32 /*team*/, const CreatureData *data) { CreatureInfo const *normalInfo = objmgr.GetCreatureTemplate(Entry); if (!normalInfo) @@ -936,7 +936,7 @@ bool Creature::isCanTrainingAndResetTalentsOf(Player* pPlayer) const && pPlayer->getClass() == GetCreatureInfo()->trainer_class; } -void Creature::AI_SendMoveToPacket(float x, float y, float z, uint32 time, uint32 MovementFlags, uint8 type) +void Creature::AI_SendMoveToPacket(float x, float y, float z, uint32 time, uint32 /*MovementFlags*/, uint8 /*type*/) { /* uint32 timeElap = getMSTime(); if ((timeElap - m_startMove) < m_moveTime) @@ -1356,7 +1356,7 @@ void Creature::DeleteFromDB() WorldDatabase.CommitTransaction(); } -bool Creature::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool is3dDistance) const +bool Creature::canSeeOrDetect(Unit const* u, bool detect, bool /*inVisibleList*/, bool /*is3dDistance*/) const { // not in world if (!IsInWorld() || !u->IsInWorld()) diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index 628b156fcf1..62396d528be 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -26,7 +26,7 @@ #include "Vehicle.h" //Disable CreatureAI when charmed -void CreatureAI::OnCharmed(bool apply) +void CreatureAI::OnCharmed(bool /*apply*/) { //me->IsAIEnabled = !apply;*/ me->NeedChangeAI = true; diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h index d06fe80d0fa..d22bccfaf4d 100644 --- a/src/game/CreatureAI.h +++ b/src/game/CreatureAI.h @@ -100,7 +100,7 @@ class CreatureAI : public UnitAI // Called at any Damage from any attacker (before damage apply) // Note: it for recalculation damage or special reaction at damage // for attack reaction use AttackedBy called for not DOT damage in Unit::DealDamage also - virtual void DamageTaken(Unit *done_by, uint32 & /*damage*/) {} + virtual void DamageTaken(Unit * /*done_by*/, uint32 & /*damage*/) {} // Called when the creature is killed virtual void JustDied(Unit *) {} @@ -110,7 +110,7 @@ class CreatureAI : public UnitAI // Called when the creature summon successfully other creature virtual void JustSummoned(Creature*) {} - virtual void IsSummonedBy(Unit *summoner) {} + virtual void IsSummonedBy(Unit * /*summoner*/) {} virtual void SummonedCreatureDespawn(Creature* /*unit*/) {} @@ -118,10 +118,10 @@ class CreatureAI : public UnitAI virtual void SpellHit(Unit*, const SpellEntry*) {} // Called when spell hits a target - virtual void SpellHitTarget(Unit* target, const SpellEntry*) {} + virtual void SpellHitTarget(Unit* /*target*/, const SpellEntry*) {} // Called to get trigger target for aura effect - virtual Unit * GetAuraEffectTriggerTarget(uint32 spellId, uint8 effIndex) {return NULL;} + virtual Unit * GetAuraEffectTriggerTarget(uint32 /*spellId*/, uint8 /*effIndex*/) {return NULL;} // Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc) //virtual void AttackedBy(Unit* attacker); @@ -143,7 +143,7 @@ class CreatureAI : public UnitAI void DoZoneInCombat(Creature* pUnit = NULL); // Called at text emote receive from player - virtual void ReceiveEmote(Player* pPlayer, uint32 text_emote) {} + virtual void ReceiveEmote(Player* /*pPlayer*/, uint32 /*text_emote*/) {} /// == Triggered Actions Requested ================== @@ -152,7 +152,7 @@ class CreatureAI : public UnitAI //virtual void AttackStart(Unit *) {} // Called at World update tick - //virtual void UpdateAI(const uint32 diff) {} + //virtual void UpdateAI(const uint32 /*diff*/) {} /// == State checks ================================= @@ -170,7 +170,7 @@ class CreatureAI : public UnitAI // Pointer to controlled by AI creature //Creature* const me; - virtual void PassengerBoarded(Unit *who, int8 seatId, bool apply) {} + virtual void PassengerBoarded(Unit * /*who*/, int8 /*seatId*/, bool /*apply*/) {} protected: virtual void MoveInLineOfSight(Unit *); diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index ce70e0961ef..9971dbdc937 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -1339,7 +1339,7 @@ void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote) } } -void CreatureEventAI::DamageTaken(Unit* done_by, uint32& damage) +void CreatureEventAI::DamageTaken(Unit* /*done_by*/, uint32& damage) { if (InvinceabilityHpLevel > 0 && me->GetHealth() < InvinceabilityHpLevel+damage) { diff --git a/src/game/CreatureEventAI.h b/src/game/CreatureEventAI.h index 921d0facc12..2fc5de46089 100644 --- a/src/game/CreatureEventAI.h +++ b/src/game/CreatureEventAI.h @@ -594,7 +594,7 @@ class CreatureEventAI : public CreatureAI void JustReachedHome(); void EnterCombat(Unit *enemy); void EnterEvadeMode(); - void JustDied(Unit* killer); + void JustDied(Unit* /*killer*/); void KilledUnit(Unit* victim); void JustSummoned(Creature* pUnit); void AttackStart(Unit *who); diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp index 407a45389ec..3f7c5cb7134 100644 --- a/src/game/FleeingMovementGenerator.cpp +++ b/src/game/FleeingMovementGenerator.cpp @@ -61,7 +61,7 @@ bool FleeingMovementGenerator<Creature>::GetDestination(float &x, float &y, floa } template<> -bool FleeingMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const +bool FleeingMovementGenerator<Player>::GetDestination(float & /*x*/, float & /*y*/, float & /*z*/) const { return false; } diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 53b0dc5812a..ced9c495a7e 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -74,7 +74,7 @@ GameObject::~GameObject() // CleanupsBeforeDelete(); } -void GameObject::CleanupsBeforeDelete(bool finalCleanup) +void GameObject::CleanupsBeforeDelete(bool /*finalCleanup*/) { if (IsInWorld()) RemoveFromWorld(); diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 588db34d5d2..5bb9ab28145 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -1533,7 +1533,7 @@ void Group::UpdateLooterGuid(WorldObject* pLootedObject, bool ifneed) } } -GroupJoinBattlegroundResult Group::CanJoinBattleGroundQueue(BattleGround const* bgOrTemplate, BattleGroundQueueTypeId bgQueueTypeId, uint32 MinPlayerCount, uint32 MaxPlayerCount, bool isRated, uint32 arenaSlot) +GroupJoinBattlegroundResult Group::CanJoinBattleGroundQueue(BattleGround const* bgOrTemplate, BattleGroundQueueTypeId bgQueueTypeId, uint32 MinPlayerCount, uint32 /*MaxPlayerCount*/, bool isRated, uint32 arenaSlot) { BattlemasterListEntry const* bgEntry = sBattlemasterListStore.LookupEntry(bgOrTemplate->GetTypeID()); if (!bgEntry) diff --git a/src/game/Guild.h b/src/game/Guild.h index 717306688b4..4a9121dedff 100644 --- a/src/game/Guild.h +++ b/src/game/Guild.h @@ -200,7 +200,6 @@ inline uint32 GetGuildBankTabPrice(uint8 Index) default: return 0; } - return 0; } struct GuildEventLogEntry diff --git a/src/game/IdleMovementGenerator.cpp b/src/game/IdleMovementGenerator.cpp index 450da1ba925..54d9ad16f7d 100644 --- a/src/game/IdleMovementGenerator.cpp +++ b/src/game/IdleMovementGenerator.cpp @@ -96,7 +96,7 @@ DistractMovementGenerator::Finalize(Unit& owner) } bool -DistractMovementGenerator::Update(Unit& owner, const uint32& time_diff) +DistractMovementGenerator::Update(Unit& /*owner*/, const uint32& time_diff) { if (time_diff > m_timer) return false; diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h index a54a6cdd1e2..31536a03a22 100644 --- a/src/game/InstanceData.h +++ b/src/game/InstanceData.h @@ -130,7 +130,7 @@ class InstanceData : public ZoneScript void SaveToDB(); - virtual void Update(uint32 diff) {} + virtual void Update(uint32 /*diff*/) {} //Used by the map's CanEnter function. //This is to prevent players from entering during boss encounters. diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp index de79dfa8923..198152fd62e 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/InstanceSaveMgr.cpp @@ -235,7 +235,7 @@ void InstanceSaveManager::_DelHelper(DatabaseType &db, const char *fields, const va_list ap; char szQueryTail [MAX_QUERY_LEN]; va_start(ap, queryTail); - int res = vsnprintf(szQueryTail, MAX_QUERY_LEN, queryTail, ap); + vsnprintf(szQueryTail, MAX_QUERY_LEN, queryTail, ap); va_end(ap); QueryResult_AutoPtr result = db.PQuery("SELECT %s FROM %s %s", fields, table, szQueryTail); @@ -258,8 +258,6 @@ void InstanceSaveManager::_DelHelper(DatabaseType &db, const char *fields, const void InstanceSaveManager::CleanupInstances() { - uint64 now = (uint64)time(NULL); - barGoLink bar(2); bar.step(); diff --git a/src/game/LFGHandler.cpp b/src/game/LFGHandler.cpp index f7323ffad64..a98ec48e864 100644 --- a/src/game/LFGHandler.cpp +++ b/src/game/LFGHandler.cpp @@ -258,7 +258,7 @@ void WorldSession::HandleLookingForGroup(WorldPacket& recv_data) SendLfgUpdate(0, 1, 0); } -void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type) +void WorldSession::SendLfgResult(uint32 /*type*/, uint32 /*entry*/, uint8 /*lfg_type*/) {/* uint32 number = 0; @@ -428,7 +428,7 @@ void WorldSession::HandleLfgSetRoles(WorldPacket &recv_data) _player->m_lookingForGroup.roles = roles; } -void WorldSession::SendLfgUpdate(uint8 unk1, uint8 unk2, uint8 unk3) +void WorldSession::SendLfgUpdate(uint8 /*unk1*/, uint8 /*unk2*/, uint8 /*unk3*/) { } diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index f40f937c6c0..384d88bbed7 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -48,7 +48,7 @@ bool ChatHandler::HandleHelpCommand(const char* args) return true; } -bool ChatHandler::HandleCommandsCommand(const char* args) +bool ChatHandler::HandleCommandsCommand(const char* /*args*/) { ShowHelpForCommand(getCommandTable(), ""); return true; diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 07c0278b634..ba82b7aff7b 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -295,7 +295,7 @@ std::string ChatHandler::PGetParseString(int32 entry, ...) return (std::string)str; } -bool ChatHandler::HandleGMTicketListCommand(const char* args) +bool ChatHandler::HandleGMTicketListCommand(const char* /*args*/) { SendSysMessage(LANG_COMMAND_TICKETSHOWLIST); for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) @@ -317,7 +317,7 @@ bool ChatHandler::HandleGMTicketListCommand(const char* args) return true; } -bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args) +bool ChatHandler::HandleGMTicketListOnlineCommand(const char* /*args*/) { SendSysMessage(LANG_COMMAND_TICKETSHOWONLINELIST); for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) @@ -340,7 +340,7 @@ bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args) return true; } -bool ChatHandler::HandleGMTicketListClosedCommand(const char* args) +bool ChatHandler::HandleGMTicketListClosedCommand(const char* /*args*/) { SendSysMessage(LANG_COMMAND_TICKETSHOWCLOSEDLIST); for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) @@ -946,7 +946,7 @@ bool ChatHandler::HandleGonameCommand(const char* args) } else if (cMap->IsDungeon()) { - Map* pMap = _player->GetMap(); + //Map* pMap = _player->GetMap(); // we have to go to instance, and can go to player only if: // 1) we are in his group (either as leader or as member) diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index a17c8b7fb0c..1b815999a98 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -1147,7 +1147,7 @@ bool ChatHandler::HandleNpcAddMoveCommand(const char* args) if (wait < 0) wait = 0; - Player* player = m_session->GetPlayer(); + //Player* player = m_session->GetPlayer(); //WaypointMgr.AddLastNode(lowguid, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), wait, 0); @@ -2354,7 +2354,7 @@ bool ChatHandler::HandleWpAddCommand(const char* args) point = (*result)[0].GetUInt32(); Player* player = m_session->GetPlayer(); - Map *map = player->GetMap(); + //Map *map = player->GetMap(); WorldDatabase.PExecuteLog("INSERT INTO waypoint_data (id, point, position_x, position_y, position_z) VALUES ('%u','%u','%f', '%f', '%f')", pathid, point+1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); @@ -2437,7 +2437,7 @@ bool ChatHandler::HandleReloadAllPaths(const char* args) return true; } -bool ChatHandler::HandleWpUnLoadPathCommand(const char *args) +bool ChatHandler::HandleWpUnLoadPathCommand(const char * /*args*/) { uint32 guidlow = 0; Creature* target = getSelectedCreature(); @@ -3425,7 +3425,7 @@ bool ChatHandler::HandleLookupEventCommand(const char* args) return true; } -bool ChatHandler::HandleEventActiveListCommand(const char* args) +bool ChatHandler::HandleEventActiveListCommand(const char* /*args*/) { uint32 counter = 0; @@ -3674,8 +3674,6 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) if (!Utf8toWStr(args,wnamepart)) return false; - uint32 counter = 0; // Counter for figure out that we found smth. - // converting string that we try to find to lower case wstrToLower(wnamepart); @@ -3893,7 +3891,7 @@ bool ChatHandler::HandleWaterwalkCommand(const char* args) return true; } -bool ChatHandler::HandleCreatePetCommand(const char* args) +bool ChatHandler::HandleCreatePetCommand(const char* /*args*/) { Player *player = m_session->GetPlayer(); Creature *creatureTarget = getSelectedCreature(); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 0d9e185f2dc..79affaca6bf 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -757,7 +757,7 @@ bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*) return true; } -bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char *args) +bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char * /*args*/) { sLog.outString("Loading Linked Respawns... (`creature_linked_respawn`)"); objmgr.LoadCreatureLinkedRespawn(); @@ -1193,7 +1193,7 @@ bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg) return true; } -bool ChatHandler::HandleReloadEventAITextsCommand(const char* arg) +bool ChatHandler::HandleReloadEventAITextsCommand(const char* /*args*/) { sLog.outString("Re-Loading Texts from `creature_ai_texts`..."); @@ -1202,7 +1202,7 @@ bool ChatHandler::HandleReloadEventAITextsCommand(const char* arg) return true; } -bool ChatHandler::HandleReloadEventAISummonsCommand(const char* arg) +bool ChatHandler::HandleReloadEventAISummonsCommand(const char* /*args*/) { sLog.outString("Re-Loading Summons from `creature_ai_summons`..."); CreatureEAI_Mgr.LoadCreatureEventAI_Summons(); @@ -1210,7 +1210,7 @@ bool ChatHandler::HandleReloadEventAISummonsCommand(const char* arg) return true; } -bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* arg) +bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* /*args*/) { sLog.outString("Re-Loading Scripts from `creature_ai_scripts`..."); CreatureEAI_Mgr.LoadCreatureEventAI_Scripts(); @@ -1391,7 +1391,7 @@ bool ChatHandler::HandleReloadMailLevelRewardCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadAuctionsCommand(const char *args) +bool ChatHandler::HandleReloadAuctionsCommand(const char * /*args*/) { ///- Reload dynamic data tables from the database sLog.outString("Re-Loading Auctions..."); @@ -5113,7 +5113,7 @@ bool ChatHandler::HandleListAurasCommand (const char * /*args*/) PSendSysMessage(LANG_COMMAND_TARGET_LISTAURATYPE, uAuraList.size(), i); for (Unit::AuraEffectList::const_iterator itr = uAuraList.begin(); itr != uAuraList.end(); ++itr) { - bool talent = GetTalentSpellCost((*itr)->GetId()) > 0; + //bool talent = GetTalentSpellCost((*itr)->GetId()) > 0; char const* name = (*itr)->GetSpellProto()->SpellName[GetSessionDbcLocale()]; @@ -7414,7 +7414,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args) return true; } -bool ChatHandler::HandleListFreezeCommand(const char *args) +bool ChatHandler::HandleListFreezeCommand(const char * /*args*/) { //Get names from DB QueryResult_AutoPtr result = CharacterDatabase.PQuery("SELECT characters.name FROM characters LEFT JOIN character_aura ON (characters.guid = character_aura.guid) WHERE character_aura.spell = 9454"); @@ -7479,7 +7479,7 @@ bool ChatHandler::HandleGroupRemoveCommand(const char *args) return true; } -bool ChatHandler::HandlePossessCommand(const char *args) +bool ChatHandler::HandlePossessCommand(const char * /*args*/) { Unit *pUnit = getSelectedUnit(); if (!pUnit) @@ -7489,7 +7489,7 @@ bool ChatHandler::HandlePossessCommand(const char *args) return true; } -bool ChatHandler::HandleUnPossessCommand(const char *args) +bool ChatHandler::HandleUnPossessCommand(const char * /*args*/) { Unit *pUnit = getSelectedUnit(); if (!pUnit) @@ -7500,7 +7500,7 @@ bool ChatHandler::HandleUnPossessCommand(const char *args) return true; } -bool ChatHandler::HandleBindSightCommand(const char *args) +bool ChatHandler::HandleBindSightCommand(const char * /*args*/) { Unit *pUnit = getSelectedUnit(); if (!pUnit) @@ -7510,7 +7510,7 @@ bool ChatHandler::HandleBindSightCommand(const char *args) return true; } -bool ChatHandler::HandleUnbindSightCommand(const char *args) +bool ChatHandler::HandleUnbindSightCommand(const char * /*args*/) { if (m_session->GetPlayer()->isPossessing()) return false; diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index 9b41b3d4cbd..dcbb376208b 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -1078,7 +1078,7 @@ void LootTemplate::LootGroup::Verify(LootStore const& lootstore, uint32 id, uint } } -void LootTemplate::LootGroup::CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_set) const +void LootTemplate::LootGroup::CheckLootRefs(LootTemplateMap const& /*store*/, LootIdSet* ref_set) const { for (LootStoreItemList::const_iterator ieItr=ExplicitlyChanced.begin(); ieItr != ExplicitlyChanced.end(); ++ieItr) { diff --git a/src/game/Map.cpp b/src/game/Map.cpp index f6993e29cfb..f069d2d6fe4 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -1254,7 +1254,7 @@ void GridMap::unloadData() m_gridGetHeight = &GridMap::getHeightFromFlat; } -bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 size) +bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 /*size*/) { map_areaHeader header; fseek(in, offset, SEEK_SET); @@ -1271,7 +1271,7 @@ bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 size) return true; } -bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size) +bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 /*size*/) { map_heightHeader header; fseek(in, offset, SEEK_SET); @@ -1314,7 +1314,7 @@ bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size) return true; } -bool GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 size) +bool GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 /*size*/) { map_liquidHeader header; fseek(in, offset, SEEK_SET); diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp index da5ec2d85a3..3fe5d1b8b0b 100644 --- a/src/game/MapInstanced.cpp +++ b/src/game/MapInstanced.cpp @@ -257,7 +257,7 @@ bool MapInstanced::DestroyInstance(InstancedMaps::iterator &itr) return true; } -bool MapInstanced::CanEnter(Player *player) +bool MapInstanced::CanEnter(Player * /*player*/) { //assert(false); return true; diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index bb13caa3299..a86bb910c20 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -133,7 +133,7 @@ Map* MapManager::_createBaseMap(uint32 id) return m; } -Map* MapManager::CreateMap(uint32 id, const WorldObject* obj, uint32 instanceId) +Map* MapManager::CreateMap(uint32 id, const WorldObject* obj, uint32 /*instanceId*/) { ASSERT(obj); //if (!obj->IsInWorld()) sLog.outError("GetMap: called for map %d with object (typeid %d, guid %d, mapid %d, instanceid %d) who is not in world!", id, obj->GetTypeId(), obj->GetGUIDLow(), obj->GetMapId(), obj->GetInstanceId()); diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 7682fe24797..a0022072740 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -1673,7 +1673,7 @@ void WorldSession::HandleQueryInspectAchievements(WorldPacket & recv_data) player->GetAchievementMgr().SendRespondInspectAchievements(_player); } -void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& recv_data) +void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& /*recv_data*/) { // empty opcode sLog.outDebug("WORLD: CMSG_WORLD_STATE_UI_TIMER_UPDATE"); @@ -1683,7 +1683,7 @@ void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& recv_data) SendPacket(&data); } -void WorldSession::HandleReadyForAccountDataTimes(WorldPacket& recv_data) +void WorldSession::HandleReadyForAccountDataTimes(WorldPacket& /*recv_data*/) { // empty opcode sLog.outDebug("WORLD: CMSG_READY_FOR_ACCOUNT_DATA_TIMES"); diff --git a/src/game/MovementGeneratorImpl.h b/src/game/MovementGeneratorImpl.h index d52fb154ad4..d2778a5bff8 100644 --- a/src/game/MovementGeneratorImpl.h +++ b/src/game/MovementGeneratorImpl.h @@ -25,7 +25,7 @@ template<class MOVEMENT_GEN> inline MovementGenerator* -MovementGeneratorFactory<MOVEMENT_GEN>::Create(void *data) const +MovementGeneratorFactory<MOVEMENT_GEN>::Create(void * /*data*/) const { return (new MOVEMENT_GEN()); } diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 45cb0ead510..8b58a7c7300 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1176,7 +1176,7 @@ void WorldObject::setActive(bool on) } } -void WorldObject::CleanupsBeforeDelete(bool finalCleanup) +void WorldObject::CleanupsBeforeDelete(bool /*finalCleanup*/) { } @@ -1799,7 +1799,7 @@ void WorldObject::SetZoneScript() } } -TempSummon* WorldObject::SummonCreature(uint32 entry, const Position &pos, TempSummonType spwtype, uint32 duration, uint32 vehId) const +TempSummon* WorldObject::SummonCreature(uint32 entry, const Position &pos, TempSummonType spwtype, uint32 duration, uint32 /*vehId*/) const { if (Map *map = FindMap()) { @@ -2099,7 +2099,7 @@ void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float abs Trinity::NormalizeMapCoord(y); } -void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_size, float distance2d, float absAngle) const +void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float &y, float &z, float searcher_size, float distance2d, float absAngle) const { GetNearPoint2D(x,y,distance2d+searcher_size,absAngle); z = GetPositionZ(); diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 340507045cf..0090f6dd6b2 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -997,7 +997,7 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelid) return sCreatureModelStorage.LookupEntry<CreatureModelInfo>(modelid); } -uint32 ObjectMgr::ChooseDisplayId(uint32 team, const CreatureInfo *cinfo, const CreatureData *data /*= NULL*/) +uint32 ObjectMgr::ChooseDisplayId(uint32 /*team*/, const CreatureInfo *cinfo, const CreatureData *data /*= NULL*/) { // Load creature model (display id) uint32 display_id = 0; @@ -1484,7 +1484,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos) return true; } -uint32 ObjectMgr::AddCreData(uint32 entry, uint32 team, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay) +uint32 ObjectMgr::AddCreData(uint32 entry, uint32 /*team*/, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay) { CreatureInfo const *cInfo = GetCreatureTemplate(entry); if (!cInfo) diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp index 3fe3656226f..71659a20be7 100644 --- a/src/game/OutdoorPvP.cpp +++ b/src/game/OutdoorPvP.cpp @@ -234,12 +234,12 @@ OutdoorPvP::~OutdoorPvP() DeleteSpawns(); } -void OutdoorPvP::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvP::HandlePlayerEnterZone(Player * plr, uint32 /*zone*/) { m_players[plr->GetTeamId()].insert(plr); } -void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 /*zone*/) { // inform the objectives of the leaving for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) @@ -251,7 +251,7 @@ void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 zone) sLog.outDebug("Player %s left an outdoorpvp zone", plr->GetName()); } -void OutdoorPvP::HandlePlayerResurrects(Player * plr, uint32 zone) +void OutdoorPvP::HandlePlayerResurrects(Player * /*plr*/, uint32 /*zone*/) { } @@ -481,7 +481,7 @@ bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) return false; } -bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) +bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 /*spellId*/, GameObject * /*go*/) { if (!plr->IsOutdoorPvPActive()) return false; @@ -524,22 +524,22 @@ bool OutdoorPvP::HandleDropFlag(Player * plr, uint32 id) return false; } -bool OPvPCapturePoint::HandleGossipOption(Player * plr, uint64 guid, uint32 id) +bool OPvPCapturePoint::HandleGossipOption(Player * /*plr*/, uint64 /*guid*/, uint32 /*id*/) { return false; } -bool OPvPCapturePoint::CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso) +bool OPvPCapturePoint::CanTalkTo(Player * /*plr*/, Creature * /*c*/, GossipMenuItems /*gso*/) { return false; } -bool OPvPCapturePoint::HandleDropFlag(Player * plr, uint32 id) +bool OPvPCapturePoint::HandleDropFlag(Player * /*plr*/, uint32 /*id*/) { return false; } -int32 OPvPCapturePoint::HandleOpenGo(Player *plr, uint64 guid) +int32 OPvPCapturePoint::HandleOpenGo(Player * /*plr*/, uint64 guid) { std::map<uint64,uint32>::iterator itr = m_ObjectTypes.find(guid); if (itr != m_ObjectTypes.end()) @@ -549,7 +549,7 @@ int32 OPvPCapturePoint::HandleOpenGo(Player *plr, uint64 guid) return -1; } -bool OutdoorPvP::HandleAreaTrigger(Player *plr, uint32 trigger) +bool OutdoorPvP::HandleAreaTrigger(Player * /*plr*/, uint32 /*trigger*/) { return false; } diff --git a/src/game/OutdoorPvP.h b/src/game/OutdoorPvP.h index 1de8b6db7fb..55ea98a2a1f 100644 --- a/src/game/OutdoorPvP.h +++ b/src/game/OutdoorPvP.h @@ -91,7 +91,7 @@ class OPvPCapturePoint public: OPvPCapturePoint(OutdoorPvP * pvp); - virtual void FillInitialWorldStates(WorldPacket & data) {} + virtual void FillInitialWorldStates(WorldPacket & /*data*/) {} // send world state update to all players present void SendUpdateWorldState(uint32 field, uint32 value); @@ -112,7 +112,7 @@ public: // returns true if the state of the objective has changed, in this case, the OutdoorPvP must send a world state ui update. virtual bool Update(uint32 diff); virtual void ChangeState() = 0; - virtual void ChangeTeam(TeamId oldTeam) {} + virtual void ChangeTeam(TeamId /*oldTeam*/) {} virtual void SendChangePhase(); virtual bool HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid); @@ -181,7 +181,7 @@ public: typedef std::map<uint32/*lowguid*/, OPvPCapturePoint*> OPvPCapturePointMap; - virtual void FillInitialWorldStates(WorldPacket & data) {} + virtual void FillInitialWorldStates(WorldPacket & /*data*/) {} // called when a player triggers an areatrigger virtual bool HandleAreaTrigger(Player * plr, uint32 trigger); // called on custom spell @@ -193,7 +193,7 @@ public: virtual bool SetupOutdoorPvP() {return true;} void OnGameObjectCreate(GameObject *go, bool add); - void OnCreatureCreate(Creature *, bool add) {} + void OnCreatureCreate(Creature *, bool /*add*/) {} // send world state update to all players present void SendUpdateWorldState(uint32 field, uint32 value); @@ -203,13 +203,13 @@ public: // handle npc/player kill virtual void HandleKill(Player * killer, Unit * killed); - virtual void HandleKillImpl(Player * killer, Unit * killed) {} + virtual void HandleKillImpl(Player * /*killer*/, Unit * /*killed*/) {} // checks if player is in range of a capture credit marker bool IsInsideObjective(Player * plr) const; // awards rewards for player kill - virtual void AwardKillBonus(Player * plr) {} + virtual void AwardKillBonus(Player * /*plr*/) {} uint32 GetTypeId() {return m_TypeId;} @@ -230,7 +230,7 @@ protected: bool m_sendUpdate; // world state stuff - virtual void SendRemoveWorldStates(Player * plr) {} + virtual void SendRemoveWorldStates(Player * /*plr*/) {} void BroadcastPacket(WorldPacket & data) const; diff --git a/src/game/OutdoorPvPNA.cpp b/src/game/OutdoorPvPNA.cpp index 5c1769e6a6f..2360c1e0fb0 100644 --- a/src/game/OutdoorPvPNA.cpp +++ b/src/game/OutdoorPvPNA.cpp @@ -334,7 +334,7 @@ bool OutdoorPvPNA::Update(uint32 diff) return m_obj->Update(diff); } -bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObject * go) +bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObject * /*go*/) { std::vector<uint32> nodes; nodes.resize(2); diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp index 43e24adf555..408901f9d06 100644 --- a/src/game/OutdoorPvPSI.cpp +++ b/src/game/OutdoorPvPSI.cpp @@ -62,7 +62,7 @@ bool OutdoorPvPSI::SetupOutdoorPvP() return true; } -bool OutdoorPvPSI::Update(uint32 diff) +bool OutdoorPvPSI::Update(uint32 /*diff*/) { return false; } diff --git a/src/game/OutdoorPvPZM.cpp b/src/game/OutdoorPvPZM.cpp index e7b81c6cfad..ca7543ff1b2 100644 --- a/src/game/OutdoorPvPZM.cpp +++ b/src/game/OutdoorPvPZM.cpp @@ -201,7 +201,7 @@ void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit * killed) plr->CastSpell(plr,ZM_HordePlayerKillReward,true); } -bool OPvPCapturePointZM_GraveYard::Update(uint32 diff) +bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/) { bool retval = m_State != m_OldState; m_State = m_OldState; @@ -340,7 +340,7 @@ bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipM return false; } -bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid) +bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, uint32 /*gossipid*/) { std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid); if (itr != m_CreatureTypes.end()) @@ -368,7 +368,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, return false; } -bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * plr, uint32 spellId) +bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * /*plr*/, uint32 spellId) { switch(spellId) { diff --git a/src/game/PassiveAI.cpp b/src/game/PassiveAI.cpp index 274a6a72e51..c6c92f6df04 100644 --- a/src/game/PassiveAI.cpp +++ b/src/game/PassiveAI.cpp @@ -37,7 +37,7 @@ void PossessedAI::AttackStart(Unit *target) me->Attack(target, true); } -void PossessedAI::UpdateAI(const uint32 diff) +void PossessedAI::UpdateAI(const uint32 /*diff*/) { if (me->getVictim()) { @@ -48,7 +48,7 @@ void PossessedAI::UpdateAI(const uint32 diff) } } -void PossessedAI::JustDied(Unit *u) +void PossessedAI::JustDied(Unit * /*u*/) { // We died while possessed, disable our loot me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); @@ -61,7 +61,7 @@ void PossessedAI::KilledUnit(Unit* victim) victim->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } -void CritterAI::DamageTaken(Unit *done_by, uint32 &) +void CritterAI::DamageTaken(Unit * /*done_by*/, uint32 &) { if (!me->hasUnitState(UNIT_STAT_FLEEING)) me->SetControlled(true, UNIT_STAT_FLEEING); diff --git a/src/game/PassiveAI.h b/src/game/PassiveAI.h index ca89c808212..c13e2d1a63c 100644 --- a/src/game/PassiveAI.h +++ b/src/game/PassiveAI.h @@ -61,7 +61,7 @@ class NullCreatureAI : public CreatureAI void AttackStart(Unit *) {} void UpdateAI(const uint32) {} void EnterEvadeMode() {} - void OnCharmed(bool apply) {} + void OnCharmed(bool /*apply*/) {} static int Permissible(const Creature *) { return PERMIT_BASE_IDLE; } }; diff --git a/src/game/PetAI.h b/src/game/PetAI.h index 9712ce55145..f6087a129ae 100644 --- a/src/game/PetAI.h +++ b/src/game/PetAI.h @@ -34,12 +34,12 @@ class PetAI : public CreatureAI explicit PetAI(Creature *c); void EnterEvadeMode(); - void JustDied(Unit *who) { _stopAttack(); } + void JustDied(Unit * /*who*/) { _stopAttack(); } void UpdateAI(const uint32); static int Permissible(const Creature *); - void KilledUnit(Unit *victim); + void KilledUnit(Unit * /*victim*/); void AttackStart(Unit *target); void MovementInform(uint32 moveType, uint32 data); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index bb7e0f8157f..7a287a3dc4b 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -560,7 +560,7 @@ void Player::CleanupsBeforeDelete(bool finalCleanup) itr->second.save->RemovePlayer(this); } -bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 class_, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 outfitId) +bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 class_, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 /*outfitId*/) { //FIXME: outfitId not used in player creating @@ -963,7 +963,6 @@ int32 Player::getMaxTimer(MirrorTimerType timer) default: return 0; } - return 0; } void Player::UpdateMirrorTimers() @@ -1168,7 +1167,7 @@ void Player::Update(uint32 p_time) //if (m_spellModTakingSpell) sLog.outCrash("Player has m_spellModTakingSpell %u during update!", m_spellModTakingSpell->m_spellInfo->Id); return; - m_spellModTakingSpell = NULL; + //m_spellModTakingSpell = NULL; } //used to implement delayed far teleports @@ -6433,8 +6432,8 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt uint64 victim_guid = 0; uint32 victim_rank = 0; - uint32 rank_diff = 0; - time_t now = time(NULL); + //uint32 rank_diff = 0; + //time_t now = time(NULL); // need call before fields update to have chance move yesterday data to appropriate fields before today data change. UpdateHonorFields(); @@ -12981,8 +12980,8 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool break; // case ITEM_MOD_FERAL_ATTACK_POWER: // ((Player*)this)->ApplyFeralAPBonus(enchant_amount, apply); - sLog.outDebug("+ %u FERAL_ATTACK_POWER", enchant_amount); - break; +// sLog.outDebug("+ %u FERAL_ATTACK_POWER", enchant_amount); +// break; case ITEM_MOD_MANA_REGENERATION: ((Player*)this)->ApplyManaRegenBonus(enchant_amount, apply); sLog.outDebug("+ %u MANA_REGENERATION", enchant_amount); @@ -14579,7 +14578,7 @@ bool Player::SatisfyQuestDay(Quest const* qInfo, bool msg) return true; } -bool Player::SatisfyQuestWeek( Quest const* qInfo, bool msg ) +bool Player::SatisfyQuestWeek(Quest const* qInfo, bool /*msg*/) { if (!qInfo->IsWeekly() || m_weeklyquests.empty()) return true; @@ -15324,7 +15323,7 @@ void Player::SendPushToPartyResponse(Player *pPlayer, uint32 msg) } } -void Player::SendQuestUpdateAddItem(Quest const* pQuest, uint32 item_idx, uint32 count) +void Player::SendQuestUpdateAddItem(Quest const* /*pQuest*/, uint32 /*item_idx*/, uint32 /*count*/) { WorldPacket data(SMSG_QUESTUPDATE_ADD_ITEM, 0); sLog.outDebug("WORLD: Sent SMSG_QUESTUPDATE_ADD_ITEM"); @@ -15484,7 +15483,7 @@ bool Player::LoadPositionFromDB(uint32& mapid, float& x,float& y,float& z,float& return true; } -void Player::SetHomebind(WorldLocation const& loc, uint32 area_id) +void Player::SetHomebind(WorldLocation const& /*loc*/, uint32 /*area_id*/) { m_homebindMapId = GetMapId(); m_homebindAreaId = GetAreaId(); @@ -16211,7 +16210,7 @@ bool Player::isAllowedToLoot(const Creature* creature) return false; } -void Player::_LoadActions(QueryResult_AutoPtr result, bool startup) +void Player::_LoadActions(QueryResult_AutoPtr result, bool /*startup*/) { if (result) { @@ -18533,14 +18532,12 @@ void Player::CharmSpellInitialize() uint8 addlist = 0; if (charm->GetTypeId() != TYPEID_PLAYER) { - CreatureInfo const *cinfo = charm->ToCreature()->GetCreatureInfo(); + //CreatureInfo const *cinfo = charm->ToCreature()->GetCreatureInfo(); //if (cinfo && cinfo->type == CREATURE_TYPE_DEMON && getClass() == CLASS_WARLOCK) { for (uint32 i = 0; i < MAX_SPELL_CHARM; ++i) - { if (charmInfo->GetCharmSpell(i)->GetAction()) ++addlist; - } } } @@ -20247,13 +20244,13 @@ bool Player::IsVisibleGloballyFor(Player* u) const } template<class T> -inline void UpdateVisibilityOf_helper(std::set<uint64>& s64, T* target, std::set<Unit*>& v) +inline void UpdateVisibilityOf_helper(std::set<uint64>& s64, T* target, std::set<Unit*>& /*v*/) { s64.insert(target->GetGUID()); } template<> -inline void UpdateVisibilityOf_helper(std::set<uint64>& s64, GameObject* target, std::set<Unit*>& v) +inline void UpdateVisibilityOf_helper(std::set<uint64>& s64, GameObject* target, std::set<Unit*>& /*v*/) { if (!target->IsTransport()) s64.insert(target->GetGUID()); diff --git a/src/game/PointMovementGenerator.cpp b/src/game/PointMovementGenerator.cpp index d343dab5ad0..63787edda1d 100644 --- a/src/game/PointMovementGenerator.cpp +++ b/src/game/PointMovementGenerator.cpp @@ -73,7 +73,7 @@ void PointMovementGenerator<T>:: Finalize(T &unit) } template<class T> -void PointMovementGenerator<T>::MovementInform(T &unit) +void PointMovementGenerator<T>::MovementInform(T & /*unit*/) { } diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index a4d1e0dede2..5caf5c8a20e 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -693,7 +693,7 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket SendPacket(&data); } -void WorldSession::HandleQueryQuestsCompleted(WorldPacket & recv_data) +void WorldSession::HandleQueryQuestsCompleted(WorldPacket & /*recv_data*/) { uint32 count = 0; diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp index 8ede9b49af8..74a703fb788 100644 --- a/src/game/RandomMovementGenerator.cpp +++ b/src/game/RandomMovementGenerator.cpp @@ -57,8 +57,8 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature) Map const* map = creature.GetBaseMap(); // For 2D/3D system selection - bool is_land_ok = creature.canWalk(); - bool is_water_ok = creature.canSwim(); + //bool is_land_ok = creature.canWalk(); + //bool is_water_ok = creature.canSwim(); bool is_air_ok = creature.canFly(); for (uint32 i = 0; ; ++i) @@ -162,7 +162,7 @@ RandomMovementGenerator<Creature>::Reset(Creature &creature) template<> void -RandomMovementGenerator<Creature>::Finalize(Creature &creature){} +RandomMovementGenerator<Creature>::Finalize(Creature & /*creature*/){} template<> bool diff --git a/src/game/ScriptedCreature.cpp b/src/game/ScriptedCreature.cpp index 48f17463824..1dc8934a511 100644 --- a/src/game/ScriptedCreature.cpp +++ b/src/game/ScriptedCreature.cpp @@ -100,7 +100,7 @@ void ScriptedAI::AttackStartNoMove(Unit* pWho) DoStartNoMovement(pWho); } -void ScriptedAI::UpdateAI(const uint32 uiDiff) +void ScriptedAI::UpdateAI(const uint32 /*uiDiff*/) { //Check if we have a current target if (!UpdateVictim()) @@ -195,8 +195,6 @@ Unit* ScriptedAI::SelectUnit(SelectAggroTarget pTarget, uint32 uiPosition) default: return UnitAI::SelectTarget(pTarget, uiPosition); } - - return NULL; } SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 uiMechanic, SelectTargetType selectTargets, uint32 uiPowerCostMin, uint32 uiPowerCostMax, float fRangeMin, float fRangeMax, SelectEffect selectEffects) diff --git a/src/game/ScriptedCreature.h b/src/game/ScriptedCreature.h index b416b9f3781..a275111ddf1 100644 --- a/src/game/ScriptedCreature.h +++ b/src/game/ScriptedCreature.h @@ -52,16 +52,16 @@ struct ScriptedAI : public CreatureAI void AttackStartNoMove(Unit *pTarget); // Called at any Damage from any attacker (before damage apply) - void DamageTaken(Unit* pDone_by, uint32& uiDamage) {} + void DamageTaken(Unit* /*pDone_by*/, uint32& /*uiDamage*/) {} //Called at World update tick void UpdateAI(const uint32); //Called at creature death - void JustDied(Unit* who){} + void JustDied(Unit* /*who*/){} //Called at creature killing another unit - void KilledUnit(Unit* who){} + void KilledUnit(Unit* /*who*/){} // Called when the creature summon successfully other creature void JustSummoned(Creature*) {} @@ -70,16 +70,16 @@ struct ScriptedAI : public CreatureAI void SummonedCreatureDespawn(Creature*) {} // Called when hit by a spell - void SpellHit(Unit* caster, const SpellEntry *spell) {} + void SpellHit(Unit* /*caster*/, const SpellEntry * /*spell*/) {} // Called when spell hits a target - void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) {} + void SpellHitTarget(Unit * /*pTarget*/, const SpellEntry * /*spell*/) {} //Called at waypoint reached or PointMovement end - void MovementInform(uint32 type, uint32 id){} + void MovementInform(uint32 /*type*/, uint32 /*id*/){} // Called when AI is temporarily replaced or put back when possess is applied or removed - void OnPossess(bool apply) {} + void OnPossess(bool /*apply*/) {} //************* // Variables @@ -99,7 +99,7 @@ struct ScriptedAI : public CreatureAI void Reset() {} //Called at creature aggro either by MoveInLOS or Attack Start - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} //************* //AI Helper Functions @@ -129,7 +129,7 @@ struct ScriptedAI : public CreatureAI void DoTeleportTo(float fX, float fY, float fZ, uint32 uiTime = 0); void DoTeleportTo(const float pos[4]); - void DoAction(const int32 param) {} + void DoAction(const int32 /*param*/) {} //Teleports a player without dropping threat (only teleports to same map) void DoTeleportPlayer(Unit* pUnit, float fX, float fY, float fZ, float fO); @@ -259,8 +259,8 @@ struct BossAI : public ScriptedAI void UpdateAI(const uint32 diff) = 0; void Reset() { _Reset(); } - void EnterCombat(Unit *who) { _EnterCombat(); } - void JustDied(Unit *killer) { _JustDied(); } + void EnterCombat(Unit * /*who*/) { _EnterCombat(); } + void JustDied(Unit * /*killer*/) { _JustDied(); } void JustReachedHome() { me->setActive(false); } protected: diff --git a/src/game/ScriptedEscortAI.cpp b/src/game/ScriptedEscortAI.cpp index 1ad1cf18d74..38b583b94c3 100644 --- a/src/game/ScriptedEscortAI.cpp +++ b/src/game/ScriptedEscortAI.cpp @@ -117,7 +117,7 @@ void npc_escortAI::MoveInLineOfSight(Unit* pWho) } } -void npc_escortAI::JustDied(Unit* pKiller) +void npc_escortAI::JustDied(Unit* /*pKiller*/) { if (!HasEscortState(STATE_ESCORT_ESCORTING) || !m_uiPlayerGUID || !m_pQuestForEscort) return; @@ -300,7 +300,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff) UpdateEscortAI(uiDiff); } -void npc_escortAI::UpdateEscortAI(const uint32 uiDiff) +void npc_escortAI::UpdateEscortAI(const uint32 /*uiDiff*/) { if (!UpdateVictim()) return; diff --git a/src/game/ScriptedEscortAI.h b/src/game/ScriptedEscortAI.h index 8b8064007d4..807a5644eb8 100644 --- a/src/game/ScriptedEscortAI.h +++ b/src/game/ScriptedEscortAI.h @@ -63,7 +63,7 @@ struct npc_escortAI : public ScriptedAI void AddWaypoint(uint32 id, float x, float y, float z, uint32 WaitTimeMs = 0); virtual void WaypointReached(uint32 uiPointId) = 0; - virtual void WaypointStart(uint32 uiPointId) {} + virtual void WaypointStart(uint32 /*uiPointId*/) {} void Start(bool bIsActiveAttacker = true, bool bRun = false, uint64 uiPlayerGUID = 0, const Quest* pQuest = NULL, bool bInstantRespawn = false, bool bCanLoopPath = false); diff --git a/src/game/ScriptedFollowerAI.cpp b/src/game/ScriptedFollowerAI.cpp index 657b344469c..4f1543dc778 100644 --- a/src/game/ScriptedFollowerAI.cpp +++ b/src/game/ScriptedFollowerAI.cpp @@ -115,7 +115,7 @@ void FollowerAI::MoveInLineOfSight(Unit* pWho) } } -void FollowerAI::JustDied(Unit* pKiller) +void FollowerAI::JustDied(Unit* /*pKiller*/) { if (!HasFollowState(STATE_FOLLOW_INPROGRESS) || !m_uiLeaderGUID || !m_pQuestForFollow) return; @@ -244,7 +244,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff) UpdateFollowerAI(uiDiff); } -void FollowerAI::UpdateFollowerAI(const uint32 uiDiff) +void FollowerAI::UpdateFollowerAI(const uint32 /*uiDiff*/) { if (!UpdateVictim()) return; diff --git a/src/game/ScriptedGuardAI.h b/src/game/ScriptedGuardAI.h index 3bb43871a42..d28f612625e 100644 --- a/src/game/ScriptedGuardAI.h +++ b/src/game/ScriptedGuardAI.h @@ -18,7 +18,7 @@ struct guardAI : public ScriptedAI void Reset(); - void EnterCombat(Unit *who); + void EnterCombat(Unit * /*who*/); void JustDied(Unit *Killer); diff --git a/src/game/ScriptedSimpleAI.h b/src/game/ScriptedSimpleAI.h index c67cf842ead..c4689ff3fab 100644 --- a/src/game/ScriptedSimpleAI.h +++ b/src/game/ScriptedSimpleAI.h @@ -25,9 +25,9 @@ struct SimpleAI : public ScriptedAI void Reset(); - void EnterCombat(Unit *who); + void EnterCombat(Unit * /*who*/); - void KilledUnit(Unit *victim); + void KilledUnit(Unit * /*victim*/); void DamageTaken(Unit *killer, uint32 &damage); diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 8c45cc3313f..8a50bbda609 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -773,7 +773,7 @@ void Spell::SelectSpellTargets() } } -void Spell::prepareDataForTriggerSystem(AuraEffect const * triggeredByAura) +void Spell::prepareDataForTriggerSystem(AuraEffect const * /*triggeredByAura*/) { //========================================================================================== // Now fill data for trigger system, need know: @@ -1527,7 +1527,7 @@ bool Spell::UpdateChanneledTargetList() needAuraMask &= needAliveTargetMask; - float range; + float range = 0; if (needAuraMask) { range = GetSpellMaxRange(m_spellInfo, IsPositiveSpell(m_spellInfo->Id)); @@ -3516,7 +3516,7 @@ void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 ca break; case SPELL_FAILED_TOO_MANY_OF_ITEM: { - uint32 item; + uint32 item = 0; for (int8 x=0;x < 3;x++) if (spellInfo->EffectItemType[x]) item = spellInfo->EffectItemType[x]; diff --git a/src/game/SpellAuraEffects.cpp b/src/game/SpellAuraEffects.cpp index fa62761b31a..38e819f6021 100644 --- a/src/game/SpellAuraEffects.cpp +++ b/src/game/SpellAuraEffects.cpp @@ -876,7 +876,7 @@ void AuraEffect::CalculateSpellMod() void AuraEffect::ChangeAmount(int32 newAmount, bool mark) { - Unit * caster = GetCaster(); + //Unit * caster = GetCaster(); // Reapply if amount change if (newAmount != GetAmount()) { @@ -2331,7 +2331,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const { uint32 spellId = 0; uint32 spellId2 = 0; - uint32 spellId3 = 0; + //uint32 spellId3 = 0; uint32 HotWSpellId = 0; switch(GetMiscValue()) @@ -3495,7 +3495,7 @@ void AuraEffect::HandleAuraUntrackable(AuraApplication const * aurApp, uint8 mod /*** SKILLS & TALENTS ***/ /****************************/ -void AuraEffect::HandleAuraModPetTalentsPoints(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModPetTalentsPoints(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; @@ -3510,7 +3510,7 @@ void AuraEffect::HandleAuraModPetTalentsPoints(AuraApplication const * aurApp, u pet->InitTalentForLevel(); } -void AuraEffect::HandleAuraModSkill(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModSkill(AuraApplication const * aurApp, uint8 /*mode*/, bool apply) const { Unit * target = aurApp->GetTarget(); @@ -3679,7 +3679,7 @@ void AuraEffect::HandleAuraHover(AuraApplication const * aurApp, uint8 mode, boo target->SendMessageToSet(&data,true); } -void AuraEffect::HandleWaterBreathing(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleWaterBreathing(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; @@ -3968,7 +3968,7 @@ void AuraEffect::HandleAuraControlVehicle(AuraApplication const * aurApp, uint8 /*********************************************************/ /*** MODIFY SPEED ***/ /*********************************************************/ -void AuraEffect::HandleAuraModIncreaseSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseSpeed(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; @@ -3978,7 +3978,7 @@ void AuraEffect::HandleAuraModIncreaseSpeed(AuraApplication const * aurApp, uint target->UpdateSpeed(MOVE_RUN, true); } -void AuraEffect::HandleAuraModIncreaseMountedSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseMountedSpeed(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; @@ -4030,7 +4030,7 @@ void AuraEffect::HandleAuraModIncreaseFlightSpeed(AuraApplication const * aurApp target->UpdateSpeed(MOVE_FLIGHT, true); } -void AuraEffect::HandleAuraModIncreaseSwimSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseSwimSpeed(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; @@ -4040,7 +4040,7 @@ void AuraEffect::HandleAuraModIncreaseSwimSpeed(AuraApplication const * aurApp, target->UpdateSpeed(MOVE_SWIM, true); } -void AuraEffect::HandleAuraModDecreaseSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModDecreaseSpeed(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; @@ -4055,7 +4055,7 @@ void AuraEffect::HandleAuraModDecreaseSpeed(AuraApplication const * aurApp, uint target->UpdateSpeed(MOVE_FLIGHT_BACK, true); } -void AuraEffect::HandleAuraModUseNormalSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModUseNormalSpeed(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; @@ -4451,7 +4451,7 @@ void AuraEffect::HandleModPercentStat(AuraApplication const * aurApp, uint8 mode } } -void AuraEffect::HandleModSpellDamagePercentFromStat(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModSpellDamagePercentFromStat(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4467,7 +4467,7 @@ void AuraEffect::HandleModSpellDamagePercentFromStat(AuraApplication const * aur target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); } -void AuraEffect::HandleModSpellHealingPercentFromStat(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModSpellHealingPercentFromStat(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4481,7 +4481,7 @@ void AuraEffect::HandleModSpellHealingPercentFromStat(AuraApplication const * au target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); } -void AuraEffect::HandleModSpellDamagePercentFromAttackPower(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModSpellDamagePercentFromAttackPower(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4497,7 +4497,7 @@ void AuraEffect::HandleModSpellDamagePercentFromAttackPower(AuraApplication cons target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); } -void AuraEffect::HandleModSpellHealingPercentFromAttackPower(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModSpellHealingPercentFromAttackPower(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4511,7 +4511,7 @@ void AuraEffect::HandleModSpellHealingPercentFromAttackPower(AuraApplication con target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); } -void AuraEffect::HandleModHealingDone(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModHealingDone(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4561,7 +4561,7 @@ void AuraEffect::HandleModTotalPercentStat(AuraApplication const * aurApp, uint8 } } -void AuraEffect::HandleAuraModResistenceOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModResistenceOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4583,7 +4583,7 @@ void AuraEffect::HandleAuraModResistenceOfStatPercent(AuraApplication const * au target->UpdateArmor(); } -void AuraEffect::HandleAuraModExpertise(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModExpertise(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4600,7 +4600,7 @@ void AuraEffect::HandleAuraModExpertise(AuraApplication const * aurApp, uint8 mo /********************************/ /*** HEAL & ENERGIZE ***/ /********************************/ -void AuraEffect::HandleModPowerRegen(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModPowerRegen(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4616,7 +4616,7 @@ void AuraEffect::HandleModPowerRegen(AuraApplication const * aurApp, uint8 mode, // other powers are not immediate effects - implemented in Player::Regenerate, Creature::Regenerate } -void AuraEffect::HandleModPowerRegenPCT(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModPowerRegenPCT(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4632,7 +4632,7 @@ void AuraEffect::HandleModPowerRegenPCT(AuraApplication const * aurApp, uint8 mo // other powers are not immediate effects - implemented in Player::Regenerate, Creature::Regenerate } -void AuraEffect::HandleModManaRegen(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModManaRegen(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4764,7 +4764,7 @@ void AuraEffect::HandleAuraIncreaseBaseHealthPercent(AuraApplication const * aur /*** FIGHT ***/ /********************************/ -void AuraEffect::HandleAuraModParryPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModParryPercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4777,7 +4777,7 @@ void AuraEffect::HandleAuraModParryPercent(AuraApplication const * aurApp, uint8 target->ToPlayer()->UpdateParryPercentage(); } -void AuraEffect::HandleAuraModDodgePercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModDodgePercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4790,7 +4790,7 @@ void AuraEffect::HandleAuraModDodgePercent(AuraApplication const * aurApp, uint8 target->ToPlayer()->UpdateDodgePercentage(); } -void AuraEffect::HandleAuraModBlockPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModBlockPercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4803,7 +4803,7 @@ void AuraEffect::HandleAuraModBlockPercent(AuraApplication const * aurApp, uint8 target->ToPlayer()->UpdateBlockPercentage(); } -void AuraEffect::HandleAuraModRegenInterrupt(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModRegenInterrupt(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4891,7 +4891,7 @@ void AuraEffect::HandleModSpellCritChance(AuraApplication const * aurApp, uint8 target->m_baseSpellCritChance += (apply) ? GetAmount():-GetAmount(); } -void AuraEffect::HandleModSpellCritChanceShool(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModSpellCritChanceShool(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -5099,7 +5099,7 @@ void AuraEffect::HandleAuraModRangedAttackPowerPercent(AuraApplication const * a target->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_PCT, float(GetAmount()), apply); } -void AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -5111,7 +5111,7 @@ void AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication con target->ToPlayer()->UpdateAttackPowerAndDamage(true); } -void AuraEffect::HandleAuraModAttackPowerOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModAttackPowerOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -5123,7 +5123,7 @@ void AuraEffect::HandleAuraModAttackPowerOfStatPercent(AuraApplication const * a target->ToPlayer()->UpdateAttackPowerAndDamage(false); } -void AuraEffect::HandleAuraModAttackPowerOfArmor(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModAttackPowerOfArmor(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -5358,7 +5358,7 @@ void AuraEffect::HandleArenaPreparation(AuraApplication const * aurApp, uint8 mo } } -void AuraEffect::HandleNoReagentUseAura(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleNoReagentUseAura(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; diff --git a/src/game/SpellAuraEffects.h b/src/game/SpellAuraEffects.h index 71f42885e4f..03dd12fd9b4 100644 --- a/src/game/SpellAuraEffects.h +++ b/src/game/SpellAuraEffects.h @@ -101,15 +101,15 @@ class AuraEffect public: // aura effect handlers - void HandleNULL(AuraApplication const * aurApp, uint8 mode, bool apply) const + void HandleNULL(AuraApplication const * /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const { // not implemented } - void HandleUnused(AuraApplication const * aurApp, uint8 mode, bool apply) const + void HandleUnused(AuraApplication const * /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const { // useless } - void HandleNoImmediateEffect(AuraApplication const * aurApp, uint8 mode, bool apply) const + void HandleNoImmediateEffect(AuraApplication const * /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const { // aura type not have immediate effect at add/remove and handled by ID in other code place } diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 676c551d274..1828a3ec37f 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -117,7 +117,7 @@ void AuraApplication::_Remove() } } -bool AuraApplication::_CheckPositive(Unit * caster) const +bool AuraApplication::_CheckPositive(Unit * /*caster*/) const { // Aura is positive when it is casted by friend and at least one aura is positive // or when it is casted by enemy and at least one aura is negative @@ -527,7 +527,7 @@ void Aura::UpdateTargetMap(Unit * caster, bool apply) // targets have to be registered and not have effect applied yet to use this function void Aura::_ApplyEffectForTargets(uint8 effIndex) { - Unit * caster = GetCaster(); + //Unit * caster = GetCaster(); // prepare list of aura targets UnitList targetList; for (ApplicationMap::iterator appIter = m_applications.begin(); appIter != m_applications.end(); ++appIter) @@ -711,7 +711,7 @@ bool Aura::DropCharge() return false; } -void Aura::SetStackAmount(uint8 stackAmount, bool applied) +void Aura::SetStackAmount(uint8 stackAmount, bool /*applied*/) { if (stackAmount != m_stackAmount) { @@ -1618,7 +1618,7 @@ void DynObjAura::Remove(AuraRemoveMode removeMode) _Remove(removeMode); } -void DynObjAura::FillTargetMap(std::map<Unit *, uint8> & targets, Unit * caster) +void DynObjAura::FillTargetMap(std::map<Unit *, uint8> & targets, Unit * /*caster*/) { Unit * dynObjOwnerCaster = GetDynobjOwner()->GetCaster(); float radius = GetDynobjOwner()->GetRadius(); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 161ad24d5e2..848967ee876 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -312,7 +312,7 @@ void Spell::EffectEnvirinmentalDMG(uint32 i) m_caster->ToPlayer()->EnvironmentalDamage(DAMAGE_FIRE, damage); } -void Spell::EffectSchoolDMG(uint32 effect_idx) +void Spell::EffectSchoolDMG(uint32 /*effect_idx*/) { } @@ -356,7 +356,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) ++count; if (count) { - uint32 spellId; + uint32 spellId = 0; switch (m_spellInfo->Id) { case 28062: spellId = 29659; break; @@ -989,7 +989,7 @@ void Spell::EffectDummy(uint32 i) Creature* creatureTarget = unitTarget->ToCreature(); - GameObject* Crystal_Prison = m_caster->SummonGameObject(179644, creatureTarget->GetPositionX(), creatureTarget->GetPositionY(), creatureTarget->GetPositionZ(), creatureTarget->GetOrientation(), 0, 0, 0, 0, creatureTarget->GetRespawnTime()-time(NULL)); + m_caster->SummonGameObject(179644, creatureTarget->GetPositionX(), creatureTarget->GetPositionY(), creatureTarget->GetPositionZ(), creatureTarget->GetOrientation(), 0, 0, 0, 0, creatureTarget->GetRespawnTime()-time(NULL)); sLog.outDebug("SummonGameObject at SpellEfects.cpp EffectDummy for Spell 23019"); creatureTarget->ForcedDespawn(); @@ -2514,7 +2514,7 @@ void Spell::EffectJump(uint32 i) m_caster->GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ); } -void Spell::EffectTeleportUnits(uint32 i) +void Spell::EffectTeleportUnits(uint32 /*i*/) { if (!unitTarget || unitTarget->isInFlight()) return; @@ -2753,7 +2753,7 @@ void Spell::EffectPowerBurn(uint32 i) if (damage < 0) return; - Unit* caster = m_originalCaster ? m_originalCaster : m_caster; + //Unit* caster = m_originalCaster ? m_originalCaster : m_caster; // burn x% of target's mana, up to maximum of 2x% of caster's mana (Mana Burn) if (m_spellInfo->ManaCostPercentage) @@ -2980,7 +2980,7 @@ void Spell::EffectHealthLeech(uint32 i) // m_damage+=new_damage; } -void Spell::DoCreateItem(uint32 i, uint32 itemtype) +void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype) { if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; @@ -3125,7 +3125,7 @@ void Spell::EffectCreateItem2(uint32 i) } } -void Spell::EffectCreateRandomItem(uint32 i) +void Spell::EffectCreateRandomItem(uint32 /*i*/) { if (m_caster->GetTypeId() != TYPEID_PLAYER) return; @@ -4435,7 +4435,7 @@ void Spell::EffectTaunt(uint32 /*i*/) unitTarget->ToCreature()->AI()->AttackStart(m_caster); } -void Spell::EffectWeaponDmg(uint32 i) +void Spell::EffectWeaponDmg(uint32 /*i*/) { } @@ -4755,7 +4755,7 @@ void Spell::EffectHealMaxHealth(uint32 /*i*/) } } -void Spell::EffectInterruptCast(uint32 i) +void Spell::EffectInterruptCast(uint32 /*i*/) { if (!unitTarget) return; @@ -6701,7 +6701,7 @@ void Spell::EffectQuestComplete(uint32 i) pPlayer->AreaExploredOrEventHappens(quest_id); } -void Spell::EffectForceDeselect(uint32 i) +void Spell::EffectForceDeselect(uint32 /*i*/) { WorldPacket data(SMSG_CLEAR_TARGET, 8); data << uint64(m_caster->GetGUID()); @@ -7456,7 +7456,7 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const * if (Player* modOwner = m_originalCaster->GetSpellModOwner()) modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration); - TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN; + //TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN; Map *map = caster->GetMap(); for (uint32 count = 0; count < amount; ++count) @@ -7614,7 +7614,7 @@ void Spell::EffectCastButtons(uint32 i) } } -void Spell::EffectRechargeManaGem(uint32 i) +void Spell::EffectRechargeManaGem(uint32 /*i*/) { if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index de06727be8b..36a5f54eaa2 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -3053,7 +3053,6 @@ bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group) default: return false; } - return false; } DiminishingLevels GetDiminishingReturnsMaxLevel(DiminishingGroup group) @@ -3065,7 +3064,6 @@ DiminishingLevels GetDiminishingReturnsMaxLevel(DiminishingGroup group) default: return DIMINISHING_LEVEL_IMMUNE; } - return DIMINISHING_LEVEL_IMMUNE; } DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group) diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp index 10c3e21f519..a2ad478bfd4 100644 --- a/src/game/TargetedMovementGenerator.cpp +++ b/src/game/TargetedMovementGenerator.cpp @@ -251,7 +251,7 @@ TargetedMovementGenerator<T>::GetTarget() const } template<class T> -void TargetedMovementGenerator<T>::MovementInform(T &unit) +void TargetedMovementGenerator<T>::MovementInform(T & /*unit*/) { } diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp index 9b73ba961ff..3cf9f5d435d 100644 --- a/src/game/ThreatManager.cpp +++ b/src/game/ThreatManager.cpp @@ -32,7 +32,7 @@ //============================================================== // The pHatingUnit is not used yet -float ThreatCalcHelper::calcThreat(Unit* pHatedUnit, Unit* pHatingUnit, float fThreat, SpellSchoolMask schoolMask, SpellEntry const *pThreatSpell) +float ThreatCalcHelper::calcThreat(Unit* pHatedUnit, Unit* /*pHatingUnit*/, float fThreat, SpellSchoolMask schoolMask, SpellEntry const *pThreatSpell) { if (pThreatSpell) if (Player* modOwner = pHatedUnit->GetSpellModOwner()) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 08de8e750c0..75b8be58952 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1526,7 +1526,7 @@ void Unit::HandleEmoteCommand(uint32 anim_id) SendMessageToSet(&data, true); } -uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType) +uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEntry const *spellInfo, WeaponAttackType /*attackType*/) { uint32 newdamage = 0; float armor = pVictim->GetArmor(); @@ -2172,7 +2172,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff } } -void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool extra) +void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool /*extra*/) { if (hasUnitState(UNIT_STAT_CANNOT_AUTOATTACK) || HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED)) return; @@ -5059,7 +5059,7 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo) SendMessageToSet(&data, true); } -void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount) +void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 /*SwingType*/, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount) { CalcDamageInfo dmgInfo; dmgInfo.HitInfo = HitInfo; @@ -5074,7 +5074,7 @@ void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType, SendAttackStateUpdate(&dmgInfo); } -bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) +bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) { SpellEntry const *hasteSpell = triggeredByAura->GetSpellProto(); @@ -7449,11 +7449,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger return true; } -bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown) +bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) { SpellEntry const *dummySpell = triggeredByAura->GetSpellProto (); - uint32 effIndex = triggeredByAura->GetEffIndex(); - int32 triggerAmount = triggeredByAura->GetAmount(); + //uint32 effIndex = triggeredByAura->GetEffIndex(); + //int32 triggerAmount = triggeredByAura->GetAmount(); Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER ? this->ToPlayer()->GetItemByGuid(triggeredByAura->GetBase()->GetCastItemGUID()) : NULL; @@ -7506,11 +7506,11 @@ bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* this->ToPlayer()->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown); return true; } -bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown) +bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) { SpellEntry const *dummySpell = triggeredByAura->GetSpellProto (); - uint32 effIndex = triggeredByAura->GetEffIndex(); - int32 triggerAmount = triggeredByAura->GetAmount(); + //uint32 effIndex = triggeredByAura->GetEffIndex(); + //int32 triggerAmount = triggeredByAura->GetAmount(); Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER ? this->ToPlayer()->GetItemByGuid(triggeredByAura->GetBase()->GetCastItemGUID()) : NULL; @@ -7568,7 +7568,7 @@ bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 damage, AuraEff // Used in case when access to whole aura is needed // All procs should be handled like this... -bool Unit::HandleAuraProc(Unit *pVictim, uint32 damage, Aura * triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown, bool * handled) +bool Unit::HandleAuraProc(Unit * /*pVictim*/, uint32 damage, Aura * triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 procEx, uint32 /*cooldown*/, bool * handled) { SpellEntry const *dummySpell = triggeredByAura->GetSpellProto(); @@ -8411,7 +8411,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig return true; } -bool Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 damage, AuraEffect *triggeredByAura, SpellEntry const *procSpell, uint32 cooldown) +bool Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect *triggeredByAura, SpellEntry const *procSpell, uint32 cooldown) { int32 scriptId = triggeredByAura->GetMiscValue(); @@ -11586,7 +11586,7 @@ bool Unit::isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList, return u->canSeeOrDetect(this, detect, inVisibleList, is3dDistance); } -bool Unit::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool is3dDistance) const +bool Unit::canSeeOrDetect(Unit const* /*u*/, bool /*detect*/, bool /*inVisibleList*/, bool /*is3dDistance*/) const { return true; } @@ -12241,7 +12241,7 @@ int32 Unit::ApplyEffectModifiers(SpellEntry const* spellProto, uint8 effect_inde return value; } -int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProto, uint8 effect_index, int32 const* effBasePoints) +int32 Unit::CalculateSpellDamage(Unit const* /*target*/, SpellEntry const* spellProto, uint8 effect_index, int32 const* effBasePoints) { int32 level = int32(getLevel()); if (level > int32(spellProto->maxLevel) && spellProto->maxLevel > 0) diff --git a/src/game/UnitAI.cpp b/src/game/UnitAI.cpp index c04a698048b..a8185453491 100644 --- a/src/game/UnitAI.cpp +++ b/src/game/UnitAI.cpp @@ -217,7 +217,7 @@ void UnitAI::DoCast(uint32 spellId) { const SpellEntry * spellInfo = GetSpellStore()->LookupEntry(spellId); bool playerOnly = spellInfo->AttributesEx3 & SPELL_ATTR_EX3_PLAYERS_ONLY; - float range = GetSpellMaxRange(spellInfo, false); + //float range = GetSpellMaxRange(spellInfo, false); target = SelectTarget(SELECT_TARGET_RANDOM, 0, GetSpellMaxRange(spellInfo, false), playerOnly); break; } diff --git a/src/game/UnitAI.h b/src/game/UnitAI.h index 81f4442cfbd..1b207711420 100644 --- a/src/game/UnitAI.h +++ b/src/game/UnitAI.h @@ -47,7 +47,7 @@ class UnitAI explicit UnitAI(Unit *u) : me(u) {} virtual ~UnitAI() {} - virtual bool CanAIAttack(const Unit *who) const { return true; } + virtual bool CanAIAttack(const Unit * /*who*/) const { return true; } virtual void AttackStart(Unit *); virtual void UpdateAI(const uint32 diff) = 0; @@ -60,9 +60,9 @@ class UnitAI // Pass parameters between AI virtual void DoAction(const int32 param = 0) {} - virtual uint32 GetData(uint32 id = 0) { return 0; } - virtual void SetData(uint32 id, uint32 value) {} - virtual void SetGUID(const uint64 &guid, int32 id = 0) {} + virtual uint32 GetData(uint32 /*id = 0*/) { return 0; } + virtual void SetData(uint32 /*id*/, uint32 /*value*/) {} + virtual void SetGUID(const uint64 &/*guid*/, int32 id = 0) {} virtual uint64 GetGUID(int32 id = 0) { return 0; } Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); @@ -155,6 +155,7 @@ class SimpleCharmedAI : public PlayerAI { public: void UpdateAI(const uint32 diff); + SimpleCharmedAI(Player *p): PlayerAI(p) {} }; #endif diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp index cb1673280ce..fb59b0bddbd 100644 --- a/src/game/WaypointManager.cpp +++ b/src/game/WaypointManager.cpp @@ -50,7 +50,7 @@ void WaypointStore::Load() return; } - WaypointPath* path_data; + WaypointPath* path_data = NULL; uint32 total_records = result->GetRowCount(); barGoLink bar(total_records); diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index 719ddd9aed5..876fb7ec057 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -31,19 +31,19 @@ template<class T> void -WaypointMovementGenerator<T>::Initialize(T &u){} +WaypointMovementGenerator<T>::Initialize(T & /*u*/){} template<> void -WaypointMovementGenerator<Creature>::Finalize(Creature &u){} +WaypointMovementGenerator<Creature>::Finalize(Creature & /*u*/){} template<> void -WaypointMovementGenerator<Player>::Finalize(Player &u){} +WaypointMovementGenerator<Player>::Finalize(Player & /*u*/){} template<class T> void -WaypointMovementGenerator<T>::MovementInform(T &unit){} +WaypointMovementGenerator<T>::MovementInform(T & /*unit*/){} template<> void WaypointMovementGenerator<Creature>::MovementInform(Creature &unit) @@ -62,20 +62,20 @@ bool WaypointMovementGenerator<Creature>::GetDestination(float &x, float &y, flo } template<> -bool WaypointMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const +bool WaypointMovementGenerator<Player>::GetDestination(float & /*x*/, float & /*y*/, float & /*z*/) const { return false; } template<> -void WaypointMovementGenerator<Creature>::Reset(Creature &unit) +void WaypointMovementGenerator<Creature>::Reset(Creature & /*unit*/unit) { StopedByPlayer = true; i_nextMoveTime.Reset(0); } template<> -void WaypointMovementGenerator<Player>::Reset(Player &unit){} +void WaypointMovementGenerator<Player>::Reset(Player & /*unit*/){} template<> void WaypointMovementGenerator<Creature>::InitTraveller(Creature &unit, const WaypointData &node) @@ -122,11 +122,11 @@ WaypointMovementGenerator<Creature>::Initialize(Creature &u) } template<> -void WaypointMovementGenerator<Player>::InitTraveller(Player &unit, const WaypointData &node){} +void WaypointMovementGenerator<Player>::InitTraveller(Player & /*unit*/, const WaypointData & /*node*/){} template<class T> bool -WaypointMovementGenerator<T>::Update(T &unit, const uint32 &diff) +WaypointMovementGenerator<T>::Update(T & /*unit*/, const uint32 & /*diff*/) { return false; } diff --git a/src/game/World.cpp b/src/game/World.cpp index 2e7331e1e67..a8eaa306127 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -1913,8 +1913,8 @@ void World::Update(uint32 diff) { if (m_timers[WUPDATE_CLEANDB].Passed()) { - uint32 tmpDiff = (m_gameTime - m_startTime); - uint32 maxClientsNum = sWorld.GetMaxActiveSessionCount(); + //uint32 tmpDiff = (m_gameTime - m_startTime); + //uint32 maxClientsNum = sWorld.GetMaxActiveSessionCount(); m_timers[WUPDATE_CLEANDB].Reset(); loginDatabase.PExecute("DELETE FROM logs WHERE (time + %u) < "UI64FMTD";", @@ -2581,7 +2581,7 @@ void World::ResetWeeklyQuests() sWorld.setWorldState(WS_WEEKLY_QUEST_RESET_TIME, uint64(m_NextWeeklyQuestReset)); } -void World::SetPlayerLimit(int32 limit, bool needUpdate) +void World::SetPlayerLimit(int32 limit, bool /*needUpdate*/) { m_playerLimit = limit; } diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index 822d25b1711..efa15171750 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -252,10 +252,11 @@ bool WorldSession::Update(uint32 /*diff*/) LogUnprocessedTail(packet); break; case STATUS_NEVER: - break; + /* sLog.outError("SESSION: received not allowed opcode %s (0x%.4X)", LookupOpcodeName(packet->GetOpcode()), packet->GetOpcode()); + */ break; } } diff --git a/src/game/ZoneScript.h b/src/game/ZoneScript.h index 148ca994af0..ab74c8aa5d4 100644 --- a/src/game/ZoneScript.h +++ b/src/game/ZoneScript.h @@ -31,11 +31,11 @@ class ZoneScript public: explicit ZoneScript() {} - virtual uint32 GetCreatureEntry(uint32 guidlow, const CreatureData *data) { return data->id; } - virtual uint32 GetGameObjectEntry(uint32 guidlow, uint32 entry) { return entry; } + virtual uint32 GetCreatureEntry(uint32 /*guidlow*/, const CreatureData *data) { return data->id; } + virtual uint32 GetGameObjectEntry(uint32 /*guidlow*/, uint32 entry) { return entry; } - virtual void OnCreatureCreate(Creature *, bool add) {} - virtual void OnGameObjectCreate(GameObject *go, bool add) {} + virtual void OnCreatureCreate(Creature *, bool /*add*/) {} + virtual void OnGameObjectCreate(GameObject * /*go*/, bool /*add*/) {} //All-purpose data storage 64 bit virtual uint64 GetData64(uint32 /*DataId*/) { return 0; } @@ -45,7 +45,7 @@ class ZoneScript virtual uint32 GetData(uint32 /*DataId*/) { return 0; } virtual void SetData(uint32 /*DataId*/, uint32 /*Value*/) {} - virtual void ProcessEvent(GameObject *obj, uint32 eventId) {} + virtual void ProcessEvent(GameObject * /*obj*/, uint32 /*eventId*/) {} }; #endif
\ No newline at end of file diff --git a/src/scripts/custom/npc_acherus_taxi.cpp b/src/scripts/custom/npc_acherus_taxi.cpp index 6af6295be88..6e00e365e8e 100644 --- a/src/scripts/custom/npc_acherus_taxi.cpp +++ b/src/scripts/custom/npc_acherus_taxi.cpp @@ -11,7 +11,7 @@ bool GossipHello_npc_acherus_taxi(Player *pPlayer, Creature *pCreature) return true; } -bool GossipSelect_npc_acherus_taxi(Player *pPlayer, Creature *pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_acherus_taxi(Player *pPlayer, Creature * /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { diff --git a/src/scripts/custom/npc_wyrmresttempel_taxi.cpp b/src/scripts/custom/npc_wyrmresttempel_taxi.cpp index 62530b3be64..d4c2cb5ab74 100644 --- a/src/scripts/custom/npc_wyrmresttempel_taxi.cpp +++ b/src/scripts/custom/npc_wyrmresttempel_taxi.cpp @@ -19,7 +19,7 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DOWN, GOSSIP_SENDER_MAIN, GOSS return true; } -bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { @@ -45,7 +45,7 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GO return true; } -bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 4) { @@ -71,7 +71,7 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ONEDOWN, GOSSIP_SENDER_MAIN, G return true; } -bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 5) { diff --git a/src/scripts/custom/on_events.cpp b/src/scripts/custom/on_events.cpp index eca1c266bf6..94e54a07fba 100644 --- a/src/scripts/custom/on_events.cpp +++ b/src/scripts/custom/on_events.cpp @@ -2,67 +2,67 @@ #include <cstring> //This function is called when the player logs in (every login) -void OnLogin(Player *pPlayer) +void OnLogin(Player * /*pPlayer*/) { } //This function is called when the player logs out -void OnLogout(Player *pPlayer) +void OnLogout(Player * /*pPlayer*/) { } //This function is called when the player kills another player -void OnPVPKill(Player *killer, Player *killed) +void OnPVPKill(Player * /*killer*/, Player * /*killed*/) { } //This function is called when a players AreaID changes -void OnAreaChange(Player *pPlayer, AreaTableEntry const *pArea) +void OnAreaChange(Player * /*pPlayer*/, AreaTableEntry const * /*pArea*/) { } //This is called when a player kills a creature (non pvp) -void OnCreatureKill(Player *pPlayer, Creature *pCreature) +void OnCreatureKill(Player * /*pPlayer*/, Creature * /*pCreature*/) { } //This function is called when a player has a money exchange -int32 OnGetMoney(Player *pPlayer, int32 amount) +int32 OnGetMoney(Player * /*pPlayer*/, int32 amount) { return amount; } //This function is called whenever a player gets XP -uint32 OnGetXP(Player *pPlayer, uint32 amount) +uint32 OnGetXP(Player * /*pPlayer*/, uint32 amount) { return amount; } //This function is called when a player clicks a GO Object -bool OnGoClick(Player *pPlayer, GameObject *pGameObject) +bool OnGoClick(Player * /*pPlayer*/, GameObject * /*pGameObject*/) { return true; } //This function is called when a player clicks and item -bool OnItemClick(Player *pPlayer, Item *pItem) +bool OnItemClick(Player * /*pPlayer*/, Item * /*pItem*/) { return true; } //This function is called when a player opens an item (like a clam) -bool OnItemOpen(Player *pPlayer, Item *pItem) +bool OnItemOpen(Player * /*pPlayer*/, Item * /*pItem*/) { return true; } //This function is called when a player sends a chat message -bool OnPlayerChat(Player *pPlayer, const char *text) +bool OnPlayerChat(Player * /*pPlayer*/, const char * /*text*/) { return true; } @@ -79,7 +79,7 @@ void OnServerShutdown() } //this function is called when a player casts a spell -bool OnSpellCast(Unit *pUnitTarget, Item *pItemTarget, GameObject *pGoTarget, uint32 i, SpellEntry const *spell) +bool OnSpellCast(Unit * /*pUnitTarget*/, Item * /*pItemTarget*/, GameObject * /*pGoTarget*/, uint32 /*i*/, SpellEntry const * /*spell*/) { return true; } diff --git a/src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp b/src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp index d1187748b22..ce2a81c864a 100644 --- a/src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp +++ b/src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp @@ -103,7 +103,7 @@ struct boss_balindaAI : public ScriptedAI Summons.DespawnAll(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(YELL_AGGRO, me); } @@ -121,7 +121,7 @@ struct boss_balindaAI : public ScriptedAI Summons.Summon(summoned); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { Summons.DespawnAll(); } diff --git a/src/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp b/src/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp index 58caad75968..6477ebe5eaf 100644 --- a/src/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp +++ b/src/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp @@ -61,7 +61,7 @@ struct boss_drektharAI : public ScriptedAI uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); //20 to 30 seconds } - void Aggro(Unit *who) + void Aggro(Unit * /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp b/src/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp index 5b490b06319..a12b9f267f9 100644 --- a/src/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp +++ b/src/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp @@ -54,7 +54,7 @@ struct boss_galvangarAI : public ScriptedAI uiResetTimer = 5*IN_MILISECONDS; } - void Aggro(Unit *who) + void Aggro(Unit * /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp b/src/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp index 989b78c8892..785827bc5d9 100644 --- a/src/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp +++ b/src/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp @@ -59,7 +59,7 @@ struct boss_vanndarAI : public ScriptedAI uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); } - void Aggro(Unit *who) + void Aggro(Unit * /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/arathi_highlands.cpp b/src/scripts/eastern_kingdoms/arathi_highlands.cpp index 8e74c3ab601..86edbc2ed9d 100644 --- a/src/scripts/eastern_kingdoms/arathi_highlands.cpp +++ b/src/scripts/eastern_kingdoms/arathi_highlands.cpp @@ -91,7 +91,7 @@ struct npc_professor_phizzlethorpeAI : public npc_escortAI pSummoned->AI()->AttackStart(me); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp index 2dbf91c72b6..e04fa8444b2 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp @@ -44,7 +44,7 @@ EndContentData */ +## go_shadowforge_brazier +######*/ -bool GOHello_go_shadowforge_brazier(Player* pPlayer, GameObject* pGo) +bool GOHello_go_shadowforge_brazier(Player* /*pPlayer*/, GameObject* pGo) { if (ScriptedInstance* pInstance = pGo->GetInstanceData()) { @@ -94,7 +94,7 @@ uint32 RingBoss[]= 9032, // Hedrum }; -bool AreaTrigger_at_ring_of_law(Player* pPlayer, const AreaTriggerEntry *at) +bool AreaTrigger_at_ring_of_law(Player* pPlayer, const AreaTriggerEntry * /*at*/) { if (ScriptedInstance* pInstance = pPlayer->GetInstanceData()) { @@ -451,7 +451,7 @@ bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -545,7 +545,7 @@ bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { @@ -1235,7 +1235,7 @@ CreatureAI* GetAI_npc_rocknot(Creature* pCreature) return new npc_rocknotAI(pCreature); } -bool ChooseReward_npc_rocknot(Player* pPlayer, Creature* pCreature, const Quest *_Quest, uint32 item) +bool ChooseReward_npc_rocknot(Player* /*pPlayer*/, Creature* pCreature, const Quest *_Quest, uint32 /*item*/) { ScriptedInstance* pInstance = pCreature->GetInstanceData(); diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp index be45b092590..a387e816951 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp @@ -41,7 +41,7 @@ struct boss_ambassador_flamelashAI : public ScriptedAI Spirit_Timer = 24000; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void SummonSpirits(Unit* victim) { diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp index b15a390a871..60e1dec236c 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp @@ -51,7 +51,7 @@ struct boss_anubshiahAI : public ScriptedAI EnvelopingWeb_Timer = 16000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index 98fe4edfc96..29fe219d6ec 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -50,13 +50,13 @@ struct boss_draganthaurissanAI : public ScriptedAI //Counter= 0; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); me->CallForHelp(VISIBLE_RANGE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_SLAY, me); } diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp index d36990933c4..77d69263133 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp @@ -49,7 +49,7 @@ struct boss_general_angerforgeAI : public ScriptedAI Medics = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp index 58db7d88cb8..886bc3fc909 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -42,7 +42,7 @@ struct boss_gorosh_the_dervishAI : public ScriptedAI MortalStrike_Timer = 22000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp index 70d258c7e86..d3551d38790 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp @@ -47,7 +47,7 @@ struct boss_grizzleAI : public ScriptedAI Frenzy_Timer =0; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp index 4586a418a06..2af203826a1 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -48,7 +48,7 @@ struct boss_high_interrogator_gerstahnAI : public ScriptedAI ShadowShield_Timer = 8000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp index 0836a94f49b..2a0cf9be133 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp @@ -47,7 +47,7 @@ struct boss_magmusAI : public ScriptedAI WarStomp_Timer =0; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp index 52b88318868..1c0ed389287 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp @@ -50,7 +50,7 @@ struct boss_moira_bronzebeardAI : public ScriptedAI Smite_Timer = 8000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp index 9acfa68fc8d..94a37e8da7e 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp @@ -57,7 +57,7 @@ bool GossipHello_boss_gloomrel(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -128,7 +128,7 @@ struct boss_doomrelAI : public ScriptedAI me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -145,7 +145,7 @@ struct boss_doomrelAI : public ScriptedAI pInstance->SetData64(DATA_EVENSTARTER, 0); } - void JustDied(Unit *who) + void JustDied(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_GHOSTKILL, 1); @@ -213,7 +213,7 @@ bool GossipHello_boss_doomrel(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_boss_doomrel(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_boss_doomrel(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp index 5564634f344..7684aa6c6ac 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp @@ -151,7 +151,7 @@ struct instance_blackrock_depths : public ScriptedInstance TombBossGUIDs[i] = 0; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -172,7 +172,7 @@ struct instance_blackrock_depths : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp index d09998cf85b..2ea115e6e0b 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp @@ -31,15 +31,13 @@ struct npc_rookey_whelpAI : public ScriptedAI ScriptedInstance* pInstance; - void JustDied(Unit *who) + void JustDied(Unit * /*who*/) { if (pInstance) - { pInstance->SetData(WHELP_DEATH_COUNT, pInstance->GetData(WHELP_DEATH_COUNT)+1); - } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -53,7 +51,7 @@ CreatureAI* GetAI_rookey_whelp(Creature* pCreature) return new npc_rookey_whelpAI(pCreature); } -bool GOHello_rookey_egg(Player *pPlayer, GameObject *pGO) +bool GOHello_rookey_egg(Player *pPlayer, GameObject * /*pGO*/) { Position pos; pPlayer->GetPosition(&pos); diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp index 72b8f96df96..b53ddaf23ef 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp @@ -45,7 +45,7 @@ struct boss_drakkisathAI : public ScriptedAI Thunderclap_Timer = 17000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp index 5854793f54c..fcd2ea1a6d0 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp @@ -75,7 +75,7 @@ struct boss_gythAI : public ScriptedAI me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp index 8d88d0b0b17..9e78667717a 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp @@ -46,7 +46,7 @@ struct boss_halyconAI : public ScriptedAI Summoned = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp index e1c84b607c2..65f1e8081a0 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp @@ -54,7 +54,7 @@ struct boss_highlordomokkAI : public ScriptedAI Slow_Timer = 24000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp index fba666349a1..60dda5a5fab 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp @@ -40,9 +40,9 @@ struct boss_mothersmolderwebAI : public ScriptedAI MothersMilk_Timer = 10000; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (me->GetHealth() <= damage) DoCast(me, SPELL_SUMMON_SPIRE_SPIDERLING, true); diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp index c93be933778..8846442705b 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp @@ -57,7 +57,7 @@ struct boss_overlordwyrmthalakAI : public ScriptedAI Summoned = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp index 94c5385292f..6cbd6955665 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp @@ -42,7 +42,7 @@ struct boss_pyroguard_emberseerAI : public ScriptedAI PyroBlast_Timer = 14000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp index 09379c09cd9..9058b35cd5c 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp @@ -43,7 +43,7 @@ struct boss_quatermasterzigrisAI : public ScriptedAI //HelingPotion_Timer = 25000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp index eb158909f61..56de5dbb385 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp @@ -42,7 +42,7 @@ struct boss_rend_blackhandAI : public ScriptedAI Thunderclap_Timer = 9000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp index 160f883f53f..73afc3b5afe 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp @@ -44,7 +44,7 @@ struct boss_shadowvoshAI : public ScriptedAI //DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp index e6693de3849..499f9cf4ce5 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp @@ -42,7 +42,7 @@ struct boss_thebeastAI : public ScriptedAI TerrifyingRoar_Timer = 23000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp index 3ce81cb1fdb..50b47c94fc5 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp @@ -51,7 +51,7 @@ struct boss_warmastervooneAI : public ScriptedAI ThrowAxe_Timer = 1000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp index 97f29039014..856e1236176 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp @@ -48,7 +48,7 @@ struct boss_broodlordAI : public ScriptedAI KnockBack_Timer = 30000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp index 5cbc819adf5..08bebe95384 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp @@ -185,7 +185,7 @@ struct boss_chromaggusAI : public ScriptedAI Enraged = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp index 190c5452c7a..49a999fc458 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp @@ -45,7 +45,7 @@ struct boss_ebonrocAI : public ScriptedAI Heal_Timer = 1000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp index 9362b1e2680..af62b1103bc 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp @@ -42,7 +42,7 @@ struct boss_firemawAI : public ScriptedAI FlameBuffet_Timer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp index 09fa06cd966..b29fe41f2b1 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp @@ -44,7 +44,7 @@ struct boss_flamegorAI : public ScriptedAI Frenzy_Timer = 10000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp index 5d9ab125cf8..5ef05be519c 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp @@ -93,12 +93,12 @@ struct boss_nefarianAI : public ScriptedAI DoScriptText(SAY_SLAY, me, Victim); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { DoScriptText(RAND(SAY_XHEALTH,SAY_AGGRO,SAY_SHADOWFLAME), me); diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp index 6bca046a271..a095756b18b 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp @@ -52,12 +52,12 @@ struct boss_razorgoreAI : public ScriptedAI Conflagration_Timer = 12000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); } diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp index 982520921df..7ab783e6e93 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp @@ -89,7 +89,7 @@ struct boss_vaelAI : public ScriptedAI me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (rand()%5) return; @@ -97,7 +97,7 @@ struct boss_vaelAI : public ScriptedAI DoScriptText(SAY_KILLTARGET, me, victim); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoCast(me, SPELL_ESSENCEOFTHERED); DoZoneInCombat(); diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp index ee0b2c9dfef..dfeb2519bae 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp @@ -202,7 +202,7 @@ struct boss_victor_nefariusAI : public ScriptedAI AttackStart(pTarget); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -350,7 +350,7 @@ bool GossipHello_boss_victor_nefarius(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/eastern_kingdoms/blasted_lands.cpp b/src/scripts/eastern_kingdoms/blasted_lands.cpp index 0a9f904992e..768242fcd22 100644 --- a/src/scripts/eastern_kingdoms/blasted_lands.cpp +++ b/src/scripts/eastern_kingdoms/blasted_lands.cpp @@ -48,7 +48,7 @@ bool GossipHello_npc_deathly_usher(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -92,7 +92,7 @@ bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/eastern_kingdoms/boss_kruul.cpp b/src/scripts/eastern_kingdoms/boss_kruul.cpp index b9cde621c14..44a6431f9ea 100644 --- a/src/scripts/eastern_kingdoms/boss_kruul.cpp +++ b/src/scripts/eastern_kingdoms/boss_kruul.cpp @@ -54,7 +54,7 @@ struct boss_kruulAI : public ScriptedAI Hound_Timer = 8000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/burning_steppes.cpp b/src/scripts/eastern_kingdoms/burning_steppes.cpp index 378aa280ccc..5a1e338b70f 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes.cpp @@ -64,7 +64,7 @@ struct npc_ragged_johnAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} }; CreatureAI* GetAI_npc_ragged_john(Creature* pCreature) @@ -84,7 +84,7 @@ bool GossipHello_npc_ragged_john(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp b/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp index 88155820b83..5c6bab46e5a 100644 --- a/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp +++ b/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp @@ -70,7 +70,7 @@ struct boss_mr_smiteAI : public ScriptedAI SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); } @@ -157,7 +157,7 @@ struct boss_mr_smiteAI : public ScriptedAI DoMeleeAttackIfReady(); } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; diff --git a/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp b/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp index 84b79a1dd41..e5a87d978ec 100644 --- a/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp +++ b/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp @@ -172,7 +172,7 @@ struct instance_deadmines : public ScriptedInstance pDoorLever->SetUInt32Value(GAMEOBJECT_FLAGS, 4); } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/dun_morogh.cpp b/src/scripts/eastern_kingdoms/dun_morogh.cpp index 734b7be0245..c0daecd8356 100644 --- a/src/scripts/eastern_kingdoms/dun_morogh.cpp +++ b/src/scripts/eastern_kingdoms/dun_morogh.cpp @@ -49,11 +49,11 @@ struct npc_narm_faulkAI : public ScriptedAI spellHit = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit * /*who*/) { return; } @@ -72,7 +72,7 @@ struct npc_narm_faulkAI : public ScriptedAI } } - void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) + void SpellHit(Unit * /*Hitter*/, const SpellEntry *Spellkind) { if (Spellkind->Id == 8593 && !spellHit) { diff --git a/src/scripts/eastern_kingdoms/duskwood.cpp b/src/scripts/eastern_kingdoms/duskwood.cpp index 45cb8dbc858..89c0ebe4213 100644 --- a/src/scripts/eastern_kingdoms/duskwood.cpp +++ b/src/scripts/eastern_kingdoms/duskwood.cpp @@ -27,7 +27,7 @@ EndScriptData */ # at_twilight_grove ######*/ -bool AreaTrigger_at_twilight_grove(Player* pPlayer, const AreaTriggerEntry *at) +bool AreaTrigger_at_twilight_grove(Player* pPlayer, const AreaTriggerEntry * /*at*/) { if (pPlayer->HasQuestForItem(21149)) { @@ -68,7 +68,7 @@ struct boss_twilight_corrupterAI : public ScriptedAI CreatureOfNightmare_Timer = 30000; KillCount = 0; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { me->MonsterYell("The Nightmare cannot be stopped!",0,me->GetGUID()); } diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp index fbd1f42a3dc..0c1d3e9072c 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp @@ -40,7 +40,7 @@ struct mobs_ghoul_flayerAI : public ScriptedAI void Reset() {} - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* Killer) { @@ -70,7 +70,7 @@ bool GossipHello_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -93,7 +93,7 @@ struct npc_darrowshire_spiritAI : public ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} }; CreatureAI* GetAI_npc_darrowshire_spirit(Creature* pCreature) @@ -131,7 +131,7 @@ bool GossipHello_npc_tirion_fordring(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_tirion_fordring(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_tirion_fordring(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/eastern_kingdoms/elwynn_forest.cpp b/src/scripts/eastern_kingdoms/elwynn_forest.cpp index 26f46800587..ce0105b9469 100644 --- a/src/scripts/eastern_kingdoms/elwynn_forest.cpp +++ b/src/scripts/eastern_kingdoms/elwynn_forest.cpp @@ -48,11 +48,11 @@ struct npc_henze_faulkAI : public ScriptedAI spellHit = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit * /*who*/) { return; } @@ -71,7 +71,7 @@ struct npc_henze_faulkAI : public ScriptedAI } } - void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) + void SpellHit(Unit * /*Hitter*/, const SpellEntry *Spellkind) { if (Spellkind->Id == 8593 && !spellHit) { diff --git a/src/scripts/eastern_kingdoms/eversong_woods.cpp b/src/scripts/eastern_kingdoms/eversong_woods.cpp index 0a5fa3fd920..4c958c44e98 100644 --- a/src/scripts/eastern_kingdoms/eversong_woods.cpp +++ b/src/scripts/eastern_kingdoms/eversong_woods.cpp @@ -72,7 +72,7 @@ struct npc_prospector_anvilwardAI : public npc_escortAI me->RestoreFaction(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { me->RestoreFaction(); } @@ -92,7 +92,7 @@ bool GossipHello_npc_prospector_anvilward(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_prospector_anvilward(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_prospector_anvilward(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -224,7 +224,7 @@ struct npc_secondTrialAI : public ScriptedAI } } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -316,7 +316,7 @@ struct master_kelerun_bloodmournAI : public ScriptedAI uint64 paladinGuid[] = {0,0,0,0}; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -385,7 +385,7 @@ struct master_kelerun_bloodmournAI : public ScriptedAI } void SecondTrialKill(); - void SummonedCreatureDespawn(Creature* c) {} + void SummonedCreatureDespawn(Creature* /*c*/) {} }; bool GossipHello_master_kelerun_bloodmourn(Player* pPlayer, Creature* pCreature) @@ -405,7 +405,7 @@ bool GossipHello_master_kelerun_bloodmourn(Player* pPlayer, Creature* pCreature) return true; } -bool QuestAccept_master_kelerun_bloodmourn(Player* pPlayer, Creature* pCreature, Quest const *quest) +bool QuestAccept_master_kelerun_bloodmourn(Player* /*pPlayer*/, Creature* pCreature, Quest const *quest) { // One Player exclusive quest, wait for user go activation if (quest->GetQuestId() == QUEST_SECOND_TRIAL) @@ -481,7 +481,7 @@ CreatureAI* GetAI_npc_secondTrial(Creature* pCreature) ## go_second_trial ######*/ -bool GOHello_go_second_trial(Player* pPlayer, GameObject* pGO) +bool GOHello_go_second_trial(Player* /*pPlayer*/, GameObject* pGO) { // find spawn :: master_kelerun_bloodmourn if (Creature *pCreature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) @@ -515,7 +515,7 @@ struct npc_apprentice_mirvedaAI : public ScriptedAI Summon = false; } - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} void JustSummoned(Creature *summoned) { @@ -529,14 +529,14 @@ struct npc_apprentice_mirvedaAI : public ScriptedAI ++KillCount; } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (PlayerGUID) if (Player* pPlayer = Unit::GetPlayer(PlayerGUID)) CAST_PLR(pPlayer)->FailQuest(QUEST_UNEXPECTED_RESULT); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (KillCount >= 3 && PlayerGUID) if (Player* pPlayer = Unit::GetPlayer(PlayerGUID)) @@ -630,7 +630,7 @@ struct npc_infused_crystalAI : public Scripted_NoMovementAI summoned->AI()->AttackStart(me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (PlayerGUID && !Completed) if (Player* pPlayer = Unit::GetPlayer(PlayerGUID)) diff --git a/src/scripts/eastern_kingdoms/ghostlands.cpp b/src/scripts/eastern_kingdoms/ghostlands.cpp index ba4a27625fc..1d8dce43605 100644 --- a/src/scripts/eastern_kingdoms/ghostlands.cpp +++ b/src/scripts/eastern_kingdoms/ghostlands.cpp @@ -47,7 +47,7 @@ bool GossipHello_npc_blood_knight_dawnstar(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_blood_knight_dawnstar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_blood_knight_dawnstar(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -80,7 +80,7 @@ bool GossipHello_npc_budd_nedreck(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_budd_nedreck(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_budd_nedreck(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -109,7 +109,7 @@ bool GossipHello_npc_rathis_tomber(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -120,7 +120,7 @@ bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature* pCreature, uint32 ## go_gilded_brazier (Paladin First Trail quest (9678)) #####*/ -bool GOHello_gilded_brazier(Player* pPlayer, GameObject* pGo) +bool GOHello_gilded_brazier(Player* pPlayer, GameObject* /*pGo*/) { if (pPlayer->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE) { diff --git a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp index e5a8e286948..c39bfb69910 100644 --- a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp +++ b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp @@ -521,7 +521,7 @@ bool GossipHello_npc_blastmaster_emi_shortfuse(Player* pPlayer, Creature* pCreat return true; } -bool GossipSelect_npc_blastmaster_emi_shortfuse(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_blastmaster_emi_shortfuse(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -552,7 +552,7 @@ struct boss_grubbisAI : public ScriptedAI CAST_CRE(pSummon)->AI()->SetData(2,1); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -560,7 +560,7 @@ struct boss_grubbisAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (!me->isSummon()) return; diff --git a/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp b/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp index 3331b69c497..dc75f795449 100644 --- a/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp +++ b/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp @@ -67,7 +67,7 @@ struct instance_gnomeregan : public ScriptedInstance OUT_LOAD_INST_DATA_COMPLETE; } - void OnCreatureCreate(Creature* pCreature, bool bAdd) + void OnCreatureCreate(Creature* pCreature, bool /*bAdd*/) { switch(pCreature->GetEntry()) { @@ -75,7 +75,7 @@ struct instance_gnomeregan : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool bAdd) + void OnGameObjectCreate(GameObject* pGo, bool /*bAdd*/) { switch(pGo->GetEntry()) { @@ -104,7 +104,7 @@ struct instance_gnomeregan : public ScriptedInstance } } - uint32 GetData(uint32 uiType, uint32 uiData) + uint32 GetData(uint32 uiType, uint32 /*uiData*/) { switch(uiType) { diff --git a/src/scripts/eastern_kingdoms/ironforge.cpp b/src/scripts/eastern_kingdoms/ironforge.cpp index 4c3fe14884c..5be56cc6c9c 100644 --- a/src/scripts/eastern_kingdoms/ironforge.cpp +++ b/src/scripts/eastern_kingdoms/ironforge.cpp @@ -53,7 +53,7 @@ bool GossipHello_npc_royal_historian_archesonus(Player* pPlayer, Creature* pCrea return true; } -bool GossipSelect_npc_royal_historian_archesonus(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_royal_historian_archesonus(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp b/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp index 8f44eee60d9..e5a70fcb1af 100644 --- a/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp +++ b/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp @@ -50,10 +50,8 @@ struct npc_converted_sentryAI : public ScriptedAI Timer = 2500; } - void MoveInLineOfSight(Unit *who) - { return; } - void EnterCombat(Unit* who) - { } + void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -95,7 +93,7 @@ struct npc_greengill_slaveAI : public ScriptedAI uint64 PlayerGUID; - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} void Reset() { @@ -126,7 +124,7 @@ struct npc_greengill_slaveAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { DoMeleeAttackIfReady(); } diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp index 53be3d74d63..7105d27ca6a 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp @@ -63,17 +63,17 @@ struct boss_curatorAI : public ScriptedAI me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, true); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp index e00a527f68d..21db1be1be3 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp @@ -60,18 +60,18 @@ struct boss_maiden_of_virtueAI : public ScriptedAI Enraged = false; } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* /*Victim*/) { if (urand(0,1) == 0) DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp index af700bf1208..a2f2a8b605e 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp @@ -62,9 +62,9 @@ struct boss_midnightAI : public ScriptedAI me->SetVisibility(VISIBILITY_ON); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { if (Phase == 2) { @@ -181,14 +181,14 @@ struct boss_attumenAI : public ScriptedAI ResetTimer = 2000; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); if (Unit *pMidnight = Unit::GetUnit(*me, Midnight)) @@ -243,7 +243,7 @@ struct boss_attumenAI : public ScriptedAI { if (ChargeTimer <= diff) { - Unit *pTarget; + Unit *pTarget = NULL; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); std::vector<Unit *> target_list; for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) @@ -277,7 +277,7 @@ struct boss_attumenAI : public ScriptedAI DoMeleeAttackIfReady(); } - void SpellHit(Unit *source, const SpellEntry *spell) + void SpellHit(Unit * /*source*/, const SpellEntry *spell) { if (spell->Mechanic == MECHANIC_DISARM) DoScriptText(SAY_DISARMED, me); diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp index 6024fd5580f..6c8fabcca35 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp @@ -110,7 +110,7 @@ struct boss_moroesAI : public ScriptedAI DoZoneInCombat(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { StartEvent(); @@ -119,12 +119,12 @@ struct boss_moroesAI : public ScriptedAI DoZoneInCombat(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); } - void JustDied(Unit* victim) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -353,7 +353,7 @@ struct boss_moroes_guestAI : public ScriptedAI return me; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (pInstance && !pInstance->GetData(TYPE_MOROES)) EnterEvadeMode(); diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp index ebb51fc74cc..004f1902bfc 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp @@ -245,13 +245,13 @@ struct boss_netherspiteAI : public ScriptedAI Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } - void Aggro(Unit *who) + void Aggro(Unit * /*who*/) { HandleDoors(false); SwitchToPortalPhase(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { HandleDoors(true); DestroyPortals(); diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp index e9adbd7d758..2e8b6f51317 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp @@ -142,7 +142,7 @@ struct boss_nightbaneAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(TYPE_NIGHTBANE, IN_PROGRESS); @@ -157,7 +157,7 @@ struct boss_nightbaneAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(TYPE_NIGHTBANE, DONE); diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp index 1ce5d61b7ba..1071eae78a0 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp @@ -105,8 +105,8 @@ struct netherspite_infernalAI : public ScriptedAI InfernalPoint *point; void Reset() {} - void EnterCombat(Unit *who) {} - void MoveInLineOfSight(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} + void MoveInLineOfSight(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -133,7 +133,7 @@ struct netherspite_infernalAI : public ScriptedAI CAST_CRE(pMalchezaar)->AI()->KilledUnit(who); } - void SpellHit(Unit *who, const SpellEntry *spell) + void SpellHit(Unit * /*who*/, const SpellEntry *spell) { if (spell->Id == SPELL_INFERNAL_RELAY) { @@ -210,12 +210,12 @@ struct boss_malchezaarAI : public ScriptedAI pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -231,7 +231,7 @@ struct boss_malchezaarAI : public ScriptedAI pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -323,7 +323,7 @@ struct boss_malchezaarAI : public ScriptedAI } } - void SummonInfernal(const uint32 diff) + void SummonInfernal(const uint32 /*diff*/) { InfernalPoint *point = NULL; Position pos; diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp index d5d65007398..394cff3ccc5 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp @@ -145,12 +145,12 @@ struct boss_aranAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -161,7 +161,7 @@ struct boss_aranAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); @@ -466,13 +466,13 @@ struct boss_aranAI : public ScriptedAI DoMeleeAttackIfReady(); } - void DamageTaken(Unit* pAttacker, uint32 &damage) + void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) { if (!DrinkInturrupted && Drinking && damage) DrinkInturrupted = true; } - void SpellHit(Unit* pAttacker, const SpellEntry* Spell) + void SpellHit(Unit* /*pAttacker*/, const SpellEntry* Spell) { //We only care about inturrupt effects and only if they are durring a spell currently being casted if ((Spell->Effect[0] != SPELL_EFFECT_INTERRUPT_CAST && @@ -506,7 +506,7 @@ struct water_elementalAI : public ScriptedAI CastTimer = 2000 + (rand()%3000); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp index ef266e4462b..5305cc8d354 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp @@ -73,7 +73,7 @@ struct mob_kilrekAI : public ScriptedAI AmplifyTimer = 2000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (!pInstance) { @@ -82,7 +82,7 @@ struct mob_kilrekAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -125,11 +125,11 @@ struct mob_demon_chainAI : public ScriptedAI SacrificeGUID = 0; } - void EnterCombat(Unit* who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (SacrificeGUID) { @@ -226,7 +226,7 @@ struct boss_terestianAI : public ScriptedAI else DoCast(me, SPELL_SUMMON_IMP, true); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -246,12 +246,12 @@ struct boss_terestianAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { for (uint8 i = 0; i < 2; ++i) { @@ -343,7 +343,7 @@ struct mob_fiendish_impAI : public ScriptedAI me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp b/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp index fd3442ec832..ae6de9c1add 100644 --- a/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp @@ -130,7 +130,7 @@ struct boss_dorotheeAI : public ScriptedAI TitoDied = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_DOROTHEE_AGGRO, me); } @@ -142,7 +142,7 @@ struct boss_dorotheeAI : public ScriptedAI void SummonTito(); // See below - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DOROTHEE_DEATH, me); @@ -216,9 +216,9 @@ struct mob_titoAI : public ScriptedAI YipTimer = 10000; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (DorotheeGUID) { @@ -294,7 +294,7 @@ struct boss_strawmanAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_STRAWMAN_AGGRO, me); } @@ -304,7 +304,7 @@ struct boss_strawmanAI : public ScriptedAI me->ForcedDespawn(); } - void SpellHit(Unit* caster, const SpellEntry *Spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *Spell) { if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand()%10))) { @@ -317,7 +317,7 @@ struct boss_strawmanAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_STRAWMAN_DEATH, me); @@ -325,7 +325,7 @@ struct boss_strawmanAI : public ScriptedAI SummonCroneIfReady(pInstance, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_STRAWMAN_SLAY, me); } @@ -385,7 +385,7 @@ struct boss_tinheadAI : public ScriptedAI RustCount = 0; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_TINHEAD_AGGRO, me); } @@ -411,7 +411,7 @@ struct boss_tinheadAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_TINHEAD_DEATH, me); @@ -419,7 +419,7 @@ struct boss_tinheadAI : public ScriptedAI SummonCroneIfReady(pInstance, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_TINHEAD_SLAY, me); } @@ -497,7 +497,7 @@ struct boss_roarAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_ROAR_AGGRO, me); } @@ -507,7 +507,7 @@ struct boss_roarAI : public ScriptedAI me->ForcedDespawn(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_ROAR_DEATH, me); @@ -515,7 +515,7 @@ struct boss_roarAI : public ScriptedAI SummonCroneIfReady(pInstance, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_ROAR_SLAY, me); } @@ -579,14 +579,14 @@ struct boss_croneAI : public ScriptedAI me->ForcedDespawn(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_CRONE_AGGRO,SAY_CRONE_AGGRO2), me); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_CRONE_DEATH, me); @@ -637,9 +637,9 @@ struct mob_cycloneAI : public ScriptedAI MoveTimer = 1000; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* /*who*/) { } @@ -721,7 +721,7 @@ bool GossipHello_npc_grandmother(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_grandmother(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_grandmother(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -764,7 +764,7 @@ struct boss_bigbadwolfAI : public ScriptedAI IsChasing = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_WOLF_AGGRO, me); } @@ -774,7 +774,7 @@ struct boss_bigbadwolfAI : public ScriptedAI me->ForcedDespawn(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoPlaySoundToSet(me, SOUND_WOLF_DEATH); @@ -981,7 +981,7 @@ struct boss_julianneAI : public ScriptedAI RomuloDead = false; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void AttackStart(Unit* who) { @@ -1004,7 +1004,7 @@ struct boss_julianneAI : public ScriptedAI me->ForcedDespawn(); } - void SpellHit(Unit* caster, const SpellEntry *Spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *Spell) { if (Spell->Id == SPELL_DRINK_POISON) { @@ -1015,7 +1015,7 @@ struct boss_julianneAI : public ScriptedAI void DamageTaken(Unit* done_by, uint32 &damage); - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_JULIANNE_DEATH02, me); @@ -1029,7 +1029,7 @@ struct boss_julianneAI : public ScriptedAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_JULIANNE_SLAY, me); } @@ -1084,7 +1084,7 @@ struct boss_romuloAI : public ScriptedAI void DamageTaken(Unit* done_by, uint32 &damage); - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_ROMULO_AGGRO, me); if (JulianneGUID) @@ -1106,7 +1106,7 @@ struct boss_romuloAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_ROMULO_DEATH, me); @@ -1121,7 +1121,7 @@ struct boss_romuloAI : public ScriptedAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_ROMULO_SLAY, me); } @@ -1129,7 +1129,7 @@ struct boss_romuloAI : public ScriptedAI void UpdateAI(const uint32 diff); }; -void boss_julianneAI::DamageTaken(Unit* done_by, uint32 &damage) +void boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage < me->GetHealth()) return; @@ -1191,7 +1191,7 @@ void boss_julianneAI::DamageTaken(Unit* done_by, uint32 &damage) error_log("TSCR: boss_julianneAI: DamageTaken reach end of code, that should not happen."); } -void boss_romuloAI::DamageTaken(Unit* done_by, uint32 &damage) +void boss_romuloAI::DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage < me->GetHealth()) return; diff --git a/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp b/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp index 1026a576e95..d38547e62f3 100644 --- a/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp @@ -104,7 +104,7 @@ struct instance_karazhan : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch (pCreature->GetEntry()) { @@ -174,7 +174,7 @@ struct instance_karazhan : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp index 3b0bd88d840..5186a794b0d 100644 --- a/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp @@ -149,7 +149,7 @@ struct npc_barnesAI : public npc_escortAI Start(false, false); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void WaypointReached(uint32 i) { @@ -354,7 +354,7 @@ bool GossipHello_npc_barnes(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { npc_barnesAI* pBarnesAI = CAST_AI(npc_barnesAI, pCreature->AI()); @@ -412,7 +412,7 @@ bool GossipHello_npc_berthold(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_berthold(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_berthold(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, true); @@ -477,7 +477,7 @@ struct npc_image_of_medivhAI : public ScriptedAI me->RemoveCorpse(); } } - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/) {} void MovementInform(uint32 type, uint32 id) { diff --git a/src/scripts/eastern_kingdoms/loch_modan.cpp b/src/scripts/eastern_kingdoms/loch_modan.cpp index 1212e2ffa9d..e99a13fb675 100644 --- a/src/scripts/eastern_kingdoms/loch_modan.cpp +++ b/src/scripts/eastern_kingdoms/loch_modan.cpp @@ -53,7 +53,7 @@ bool GossipHello_npc_mountaineer_pebblebitty(Player* pPlayer, Creature* pCreatur return true; } -bool GossipSelect_npc_mountaineer_pebblebitty(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_mountaineer_pebblebitty(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp index 005136249e7..b5835dfe0a1 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp @@ -135,7 +135,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI } } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -146,13 +146,13 @@ struct boss_felblood_kaelthasAI : public ScriptedAI // Open the encounter door } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage > me->GetHealth()) RemoveGravityLapse(); // Remove Gravity Lapse so that players fall to ground if they kill him when in air. } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (!pInstance) return; @@ -433,8 +433,8 @@ struct mob_felkael_flamestrikeAI : public ScriptedAI DoCast(me, SPELL_FLAMESTRIKE2, true); } - void EnterCombat(Unit *who) {} - void MoveInLineOfSight(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} + void MoveInLineOfSight(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { if (FlameStrikeTimer <= diff) @@ -469,9 +469,9 @@ struct mob_felkael_phoenixAI : public ScriptedAI FakeDeath = false; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void DamageTaken(Unit* pKiller, uint32 &damage) + void DamageTaken(Unit* /*pKiller*/, uint32 &damage) { if (damage < me->GetHealth()) return; @@ -508,7 +508,7 @@ struct mob_felkael_phoenixAI : public ScriptedAI } - void JustDied(Unit* slayer) + void JustDied(Unit* /*slayer*/) { me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); } @@ -564,8 +564,8 @@ struct mob_felkael_phoenix_eggAI : public ScriptedAI HatchTimer = 10000; } - void EnterCombat(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -596,7 +596,7 @@ struct mob_arcane_sphereAI : public ScriptedAI DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp index 6f880840a51..2112eaabc87 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp @@ -208,7 +208,7 @@ struct boss_priestess_delrissaAI : public ScriptedAI ++PlayersKilled; } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -396,7 +396,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (!pInstance) return; @@ -595,7 +595,7 @@ struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI boss_priestess_lackey_commonAI::Reset(); } - void Aggro(Unit* pWho) + void Aggro(Unit* /*pWho*/) { DoCast(me, SPELL_SUMMON_IMP); } @@ -861,7 +861,7 @@ struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI boss_priestess_lackey_commonAI::Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoCast(me, SPELL_BATTLE_SHOUT); } @@ -1247,7 +1247,7 @@ CreatureAI* GetAI_zelfan(Creature* pCreature) // // void JustDied(Unit *Killer){} // -// void EnterCombat(Unit *who){} +// void EnterCombat(Unit * /*who*/){} // // void UpdateAI(const uint32 diff) // { diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp index 002db4804fc..adb0700eabf 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp @@ -127,7 +127,7 @@ struct boss_selin_fireheartAI : public ScriptedAI if (Crystals.empty()) return; - float ShortestDistance = 0; + //float ShortestDistance = 0; CrystalGUID = 0; Unit* pCrystal = NULL; Unit* CrystalChosen = NULL; @@ -178,7 +178,7 @@ struct boss_selin_fireheartAI : public ScriptedAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -187,7 +187,7 @@ struct boss_selin_fireheartAI : public ScriptedAI //Close the encounter door, open it in JustDied/Reset } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); } @@ -214,7 +214,7 @@ struct boss_selin_fireheartAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -315,12 +315,12 @@ struct mob_fel_crystalAI : public ScriptedAI mob_fel_crystalAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit* who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) {} - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (ScriptedInstance* pInstance = me->GetInstanceData()) { diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp index 42329f567e5..bc8bd5cec30 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp @@ -84,18 +84,18 @@ struct boss_vexallusAI : public ScriptedAI pInstance->SetData(DATA_VEXALLUS_EVENT, NOT_STARTED); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_KILL, me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance) pInstance->SetData(DATA_VEXALLUS_EVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -200,9 +200,9 @@ struct mob_pure_energyAI : public ScriptedAI } } - void EnterCombat(Unit *who) {} - void MoveInLineOfSight(Unit *who) {} - void AttackStart(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} + void MoveInLineOfSight(Unit * /*who*/) {} + void AttackStart(Unit * /*who*/) {} }; CreatureAI* GetAI_mob_pure_energy(Creature* pCreature) diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp index 3a8d5636cb4..455c03739bc 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp @@ -125,7 +125,7 @@ struct instance_magisters_terrace : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -135,7 +135,7 @@ struct instance_magisters_terrace : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp index cc3959e4f29..e46da9cb1bf 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp @@ -133,7 +133,7 @@ bool GossipHello_npc_kalecgos(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_kalecgos(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_kalecgos(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp index c44ab5067a3..77c6fafa10a 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp @@ -45,7 +45,7 @@ struct boss_baron_geddonAI : public ScriptedAI LivingBomb_Timer = 35000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp index 15d2ccfb53d..75891cf8c43 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp @@ -49,7 +49,7 @@ struct boss_garrAI : public ScriptedAI CheckAdds_Timer = 2000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -87,7 +87,7 @@ struct mob_fireswornAI : public ScriptedAI Immolate_Timer = 4000; //These times are probably wrong } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp index 3610586cc05..9ebe69c0c4e 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp @@ -42,7 +42,7 @@ struct boss_gehennasAI : public ScriptedAI GehennasCurse_Timer = 12000; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp index c63e49e70a6..2aba378d399 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp @@ -61,7 +61,7 @@ struct boss_golemaggAI : public ScriptedAI DoCast(me, SPELL_MAGMASPLASH, true); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (m_pInstance) m_pInstance->SetData(DATA_GOLEMAGG_DEATH, 0); @@ -133,7 +133,7 @@ struct mob_core_ragerAI : public ScriptedAI m_uiMangleTimer = 7*IN_MILISECONDS; // These times are probably wrong } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) { if (me->GetHealth()*100 < me->GetMaxHealth()*50) { diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp index 1835026f5f0..50601f04147 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp @@ -42,7 +42,7 @@ struct boss_lucifronAI : public ScriptedAI ShadowShock_Timer = 6000; //6 seconds } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp index e74e6d08c9b..f612003b076 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp @@ -48,7 +48,7 @@ struct boss_magmadarAI : public ScriptedAI DoCast(me, SPELL_MAGMASPIT, true); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp index 1e014e26ef1..11ae70befcf 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp @@ -66,7 +66,7 @@ struct boss_majordomoAI : public ScriptedAI Blastwave_Timer = 10000; } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (rand()%5) return; @@ -74,7 +74,7 @@ struct boss_majordomoAI : public ScriptedAI DoScriptText(SAY_SLAY, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp index ce541198cad..71c0b40de3f 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp @@ -122,7 +122,7 @@ struct boss_ragnarosAI : public ScriptedAI HasAura = true; } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (rand()%5) return; @@ -130,7 +130,7 @@ struct boss_ragnarosAI : public ScriptedAI DoScriptText(SAY_KILL, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp index 5fb99e3a1ba..4b0774cdc54 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp @@ -47,7 +47,7 @@ struct boss_shazzrahAI : public ScriptedAI Blink_Timer = 30000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp index 302624ba170..83288fe003b 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp @@ -54,7 +54,7 @@ struct boss_sulfuronAI : public ScriptedAI Flamespear_Timer = 2000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -133,7 +133,7 @@ struct mob_flamewaker_priestAI : public ScriptedAI Immolate_Timer = 8000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp b/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp index ae7693c7b16..eb79c234134 100644 --- a/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp @@ -93,7 +93,7 @@ struct instance_molten_core : public ScriptedInstance return false; }; - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -124,7 +124,7 @@ struct instance_molten_core : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch (pCreature->GetEntry()) { @@ -243,7 +243,7 @@ struct instance_molten_core : public ScriptedInstance return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 /*data*/) { if (type == DATA_GOLEMAGG_DEATH) IsBossDied[7] = true; diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp index 0fc3bee28c4..bdbf6b7c081 100644 --- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp @@ -121,7 +121,7 @@ struct npc_unworthy_initiateAI : public ScriptedAI me->LoadEquipment(0, true); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST); events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST); @@ -176,13 +176,13 @@ struct npc_unworthy_initiate_anchorAI : public PassiveAI uint64 prisonerGUID; - void SetGUID(const uint64 &guid, int32 id) + void SetGUID(const uint64 &guid, int32 /*id*/) { if (!prisonerGUID) prisonerGUID = guid; } - uint64 GetGUID(int32 id) { return prisonerGUID; } + uint64 GetGUID(int32 /*id*/) { return prisonerGUID; } }; void npc_unworthy_initiateAI::UpdateAI(const uint32 diff) @@ -458,7 +458,7 @@ bool GossipHello_npc_death_knight_initiate(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_death_knight_initiate(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_death_knight_initiate(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -640,7 +640,7 @@ struct npc_ros_dark_riderAI : public ScriptedAI { npc_ros_dark_riderAI(Creature *c) : ScriptedAI(c) {} - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { me->ExitVehicle(); } @@ -748,7 +748,7 @@ struct npc_scarlet_ghoulAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!me->isInCombat()) { @@ -810,12 +810,12 @@ struct npc_scarlet_miner_cartAI : public PassiveAI uint64 minerGUID; - void SetGUID(const uint64 &guid, int32 id) + void SetGUID(const uint64 &guid, int32 /*id*/) { minerGUID = guid; } - void DoAction(const int32 param) + void DoAction(const int32 /*param*/) { if (Creature *miner = Unit::GetCreature(*me, minerGUID)) { @@ -827,7 +827,7 @@ struct npc_scarlet_miner_cartAI : public PassiveAI } } - void PassengerBoarded(Unit *who, int8 seatId, bool apply) + void PassengerBoarded(Unit * /*who*/, int8 /*seatId*/, bool apply) { if (!apply) if (Creature *miner = Unit::GetCreature(*me, minerGUID)) @@ -975,7 +975,7 @@ CreatureAI* GetAI_npc_scarlet_miner(Creature *_Creature) #define SPELL_CART_SUMM 52463 -bool GOHello_go_inconspicuous_mine_car(Player* pPlayer, GameObject* pGO) +bool GOHello_go_inconspicuous_mine_car(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE) { diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp index fbc17d2a6dd..91f7e0e6cbe 100644 --- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp @@ -352,7 +352,7 @@ struct mob_scarlet_courierAI : public ScriptedAI uiStage_timer = 3000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_TREE2, me); me->Unmount(); diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp index 51e20cc3c78..79af5c3030c 100644 --- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp @@ -507,7 +507,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI break; case 3: { - Unit* pTirion = Unit::GetCreature(*me, uiTirionGUID); + //Unit* pTirion = Unit::GetCreature(*me, uiTirionGUID); DoScriptText(EMOTE_LIGHT_OF_DAWN05, me); if (me->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0)) @@ -963,7 +963,9 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI case 42: // Maxwell yells for attack { - float fLichPositionX, fLichPositionY, fLichPositionZ; + float fLichPositionX = 0, + fLichPositionY = 0, + fLichPositionZ = 0; if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) { fLichPositionX = pTemp->GetPositionX(); @@ -1619,7 +1621,7 @@ bool GossipHello_npc_highlord_darion_mograine(Player* pPlayer, Creature* pCreatu return true; } -bool GossipSelect_npc_highlord_darion_mograine(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_highlord_darion_mograine(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -1639,9 +1641,9 @@ struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI { npc_the_lich_king_tirion_dawnAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); } void Reset() {} - void AttackStart(Unit *who) { return; } // very sample, just don't make them aggreesive - void UpdateAI(const uint32 diff) { return; } - void JustDied(Unit* killer) {} + void AttackStart(Unit * /*who*/) {} // very sample, just don't make them aggreesive + void UpdateAI(const uint32 /*diff*/) {} + void JustDied(Unit* /*killer*/) {} }; CreatureAI* GetAI_npc_highlord_darion_mograine(Creature* pCreature) diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp index e51dda77ba9..cb6ed1daf22 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp @@ -54,7 +54,7 @@ struct boss_arcanist_doanAI : public ScriptedAI bShielded = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp index e59120d3768..32555a550c2 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp @@ -42,7 +42,7 @@ struct boss_azshir_the_sleeplessAI : public ScriptedAI Terrify_Timer = 20000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp index 13dcfdf88dc..f7b6b7cce4b 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -54,12 +54,12 @@ struct boss_bloodmage_thalnosAI : public ScriptedAI FireNova_Timer = 40000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* /*Victim*/) { DoScriptText(SAY_KILL, me); } diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp index c1d17203f77..b3f250769b2 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp @@ -150,7 +150,7 @@ struct mob_wisp_invisAI : public ScriptedAI uint32 spell; uint32 spell2; void Reset(){} - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} void SetType(uint32 _type) { switch(Creaturetype = _type) @@ -176,7 +176,7 @@ struct mob_wisp_invisAI : public ScriptedAI DoCast(me, spell); } - void SpellHit(Unit* caster, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_WISP_FLIGHT_PORT && Creaturetype == 4) me->SetDisplayId(2027); @@ -229,7 +229,7 @@ struct mob_headAI : public ScriptedAI laugh = urand(15000,30000); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void SaySound(int32 textEntry, Unit *pTarget = 0) { DoScriptText(textEntry, me, pTarget); @@ -240,7 +240,7 @@ struct mob_headAI : public ScriptedAI laugh += 3000; } - void DamageTaken(Unit* done_by,uint32 &damage) + void DamageTaken(Unit* /*done_by*/,uint32 &damage) { if (withbody) return; @@ -464,7 +464,7 @@ struct boss_headless_horsemanAI : public ScriptedAI ++id; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); @@ -526,7 +526,7 @@ struct boss_headless_horsemanAI : public ScriptedAI SaySound(SAY_CONFLAGRATION,unit); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { me->StopMoving(); //me->GetMotionMaster()->MoveIdle(); @@ -776,9 +776,9 @@ struct mob_pulsing_pumpkinAI : public ScriptedAI me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_STUNNED); } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_SPROUTING) { @@ -800,7 +800,7 @@ struct mob_pulsing_pumpkinAI : public ScriptedAI debuffGUID = 0; } - void JustDied(Unit *killer) { if (!sprouted) Despawn(); } + void JustDied(Unit * /*killer*/) { if (!sprouted) Despawn(); } void MoveInLineOfSight(Unit *who) { @@ -812,7 +812,7 @@ struct mob_pulsing_pumpkinAI : public ScriptedAI DoStartMovement(who); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (sprouted && UpdateVictim()) DoMeleeAttackIfReady(); diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp index 00e27d36ddb..e0db29aa240 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp @@ -54,18 +54,18 @@ struct boss_herodAI : public ScriptedAI Whirlwind_Timer = 60000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_RUSHINGCHARGE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_KILL, me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { for (uint8 i = 0; i < 20; ++i) me->SummonCreature(ENTRY_SCARLET_TRAINEE, 1939.18, -431.58, 17.09, 6.22, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); @@ -119,8 +119,8 @@ struct mob_scarlet_traineeAI : public npc_escortAI uint32 Start_Timer; void Reset() {} - void WaypointReached(uint32 uiPoint) {} - void EnterCombat(Unit* who) {} + void WaypointReached(uint32 /*uiPoint*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index 40be214d5ab..b9b15f34508 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -56,7 +56,7 @@ struct boss_high_inquisitor_fairbanksAI : public ScriptedAI PowerWordShield = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp index 731e64cc7bd..300e69611cd 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -41,7 +41,7 @@ struct boss_houndmaster_lokseyAI : public ScriptedAI BloodLust_Timer = 20000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp index d0a34d461c7..b4b84fc8059 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp @@ -53,17 +53,17 @@ struct boss_interrogator_vishasAI : public ScriptedAI ShadowWordPain_Timer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* /*Victim*/) { DoScriptText(SAY_KILL, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (!pInstance) return; diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp index a03611d1077..32b85e214a0 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -95,7 +95,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI } } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_MO_AGGRO, me); DoCast(me, SPELL_RETRIBUTIONAURA); @@ -103,12 +103,12 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI me->CallForHelp(VISIBLE_RANGE); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(SAY_MO_KILL, me); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) { if (uiDamage < me->GetHealth() || m_bHasDied || m_bFakeDeath) return; @@ -145,7 +145,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI } } - void SpellHit(Unit* pWho, const SpellEntry* pSpell) + void SpellHit(Unit* /*pWho*/, const SpellEntry* pSpell) { //When hit with ressurection say text if (pSpell->Id == SPELL_SCARLETRESURRECTION) @@ -244,12 +244,12 @@ struct boss_high_inquisitor_whitemaneAI : public ScriptedAI ScriptedAI::AttackStart(pWho); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_WH_INTRO, me); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(SAY_WH_KILL, me); } diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp index a8295cbaedd..5d0a3b3792f 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp @@ -45,7 +45,7 @@ struct boss_scornAI : public ScriptedAI FrostNova_Timer = 30000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp index f3031280773..33642d4511c 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp @@ -62,7 +62,7 @@ struct instance_scarlet_monastery : public ScriptedInstance DoorHighInquisitorGUID = 0; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -71,7 +71,7 @@ struct instance_scarlet_monastery : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp index 14195c9280b..50a9e204566 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp @@ -70,11 +70,11 @@ struct boss_darkmaster_gandlingAI : public ScriptedAI Teleport_Timer = 16000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) pInstance->SetData(TYPE_GANDLING, DONE); diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp index b3ce15a80fd..8bb9ec68aca 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp @@ -31,13 +31,13 @@ struct boss_death_knight_darkreaverAI : public ScriptedAI { } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (me->GetHealth() <= damage) DoCast(me, 23261, true); //Summon Darkreaver's Fallen Charger } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } }; diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp index 067093f9e8a..5ff01d48623 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp @@ -48,7 +48,7 @@ struct boss_theolenkrastinovAI : public ScriptedAI m_uiFrenzy_Timer = 1000; } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { ScriptedInstance* pInstance = me->GetInstanceData(); if (pInstance) diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp index 6cfa26619ae..a038fc7a0b8 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp @@ -46,7 +46,7 @@ struct boss_illuciabarovAI : public ScriptedAI Fear_Timer = 30000; } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { ScriptedInstance *pInstance = me->GetInstanceData(); if (pInstance) @@ -58,7 +58,7 @@ struct boss_illuciabarovAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp index ee151a72413..c4c0f95d8d1 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp @@ -53,7 +53,7 @@ struct boss_instructormaliciaAI : public ScriptedAI TouchCounter = 0; } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { ScriptedInstance *pInstance = me->GetInstanceData(); if (pInstance) @@ -65,7 +65,7 @@ struct boss_instructormaliciaAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp index 0f12567ea11..f8d8520e394 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp @@ -47,7 +47,7 @@ struct boss_jandicebarovAI : public ScriptedAI Invisible = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -151,7 +151,7 @@ struct mob_illusionofjandicebarovAI : public ScriptedAI me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp index 763fc0cf9e6..c4ae5cc490e 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp @@ -45,7 +45,7 @@ struct boss_kormokAI : public ScriptedAI Mages = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp index fcc5b4a692e..0956a04d824 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp @@ -42,7 +42,7 @@ struct boss_lordalexeibarovAI : public ScriptedAI me->LoadCreaturesAddon(); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { ScriptedInstance *pInstance = me->GetInstanceData(); if (pInstance) @@ -54,7 +54,7 @@ struct boss_lordalexeibarovAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp index f8b1ea60423..d3b75900202 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp @@ -46,7 +46,7 @@ struct boss_lorekeeperpolkeltAI : public ScriptedAI NoxiousCatalyst_Timer = 35000; } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { ScriptedInstance *pInstance = me->GetInstanceData(); if (pInstance) @@ -58,7 +58,7 @@ struct boss_lorekeeperpolkeltAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp index 618d6f7dbde..63837e04ad5 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp @@ -53,7 +53,7 @@ struct boss_rasfrostAI : public ScriptedAI DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp index 9502900b0eb..6340f2b0e2d 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp @@ -48,7 +48,7 @@ struct boss_theravenianAI : public ScriptedAI HasYelled = false; } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { ScriptedInstance *pInstance = me->GetInstanceData(); if (pInstance) @@ -60,7 +60,7 @@ struct boss_theravenianAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp b/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp index ce82f3b95df..992849cff1b 100644 --- a/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp @@ -69,7 +69,7 @@ struct instance_scholomance : public ScriptedInstance IsBossDied[i] = false; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/searing_gorge.cpp b/src/scripts/eastern_kingdoms/searing_gorge.cpp index 114a3113159..3ad51d033da 100644 --- a/src/scripts/eastern_kingdoms/searing_gorge.cpp +++ b/src/scripts/eastern_kingdoms/searing_gorge.cpp @@ -50,7 +50,7 @@ bool GossipHello_npc_kalaran_windblade(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_kalaran_windblade(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_kalaran_windblade(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -89,7 +89,7 @@ bool GossipHello_npc_lothos_riftwaker(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_lothos_riftwaker(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_lothos_riftwaker(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { @@ -121,7 +121,7 @@ bool GossipHello_npc_zamael_lunthistle(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_zamael_lunthistle(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_zamael_lunthistle(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp b/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp index a0f097c9b02..20959641889 100644 --- a/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp @@ -86,7 +86,7 @@ struct instance_shadowfang_keep : public ScriptedInstance uiTimer = 0; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -96,7 +96,7 @@ struct instance_shadowfang_keep : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp index c41a53cf779..23b8ad89160 100644 --- a/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp +++ b/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp @@ -99,7 +99,7 @@ struct npc_shadowfang_prisonerAI : public npc_escortAI } void Reset() {} - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} }; CreatureAI* GetAI_npc_shadowfang_prisoner(Creature* pCreature) @@ -119,7 +119,7 @@ bool GossipHello_npc_shadowfang_prisoner(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_shadowfang_prisoner(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_shadowfang_prisoner(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -167,7 +167,7 @@ struct npc_arugal_voidwalkerAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) pInstance->SetData(TYPE_FENRUS, pInstance->GetData(TYPE_FENRUS) + 1); diff --git a/src/scripts/eastern_kingdoms/silvermoon_city.cpp b/src/scripts/eastern_kingdoms/silvermoon_city.cpp index 29edc1b72a3..390f083be48 100644 --- a/src/scripts/eastern_kingdoms/silvermoon_city.cpp +++ b/src/scripts/eastern_kingdoms/silvermoon_city.cpp @@ -52,13 +52,12 @@ struct npc_blood_knight_stillbladeAI : public ScriptedAI spellHit = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit * /*who*/) { - return; } void UpdateAI(const uint32 diff) diff --git a/src/scripts/eastern_kingdoms/silverpine_forest.cpp b/src/scripts/eastern_kingdoms/silverpine_forest.cpp index 2213c5fab48..dd67f048f32 100644 --- a/src/scripts/eastern_kingdoms/silverpine_forest.cpp +++ b/src/scripts/eastern_kingdoms/silverpine_forest.cpp @@ -46,11 +46,11 @@ struct npc_astor_hadrenAI : public ScriptedAI me->setFaction(68); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { } - void JustDied(Unit *who) + void JustDied(Unit * /*who*/) { me->setFaction(68); } @@ -71,7 +71,7 @@ bool GossipHello_npc_astor_hadren(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_astor_hadren(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_astor_hadren(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -231,7 +231,7 @@ struct pyrewood_ambushAI : public ScriptedAI } } - void Aggro(Unit *who){} + void Aggro(Unit * /*who*/){} void JustSummoned(Creature *pSummoned) { @@ -268,7 +268,7 @@ struct pyrewood_ambushAI : public ScriptedAI } } - void JustDied(Unit *pKiller) + void JustDied(Unit * /*pKiller*/) { if (PlayerGUID) if (Player *pPlayer = Unit::GetPlayer(PlayerGUID)) diff --git a/src/scripts/eastern_kingdoms/stormwind_city.cpp b/src/scripts/eastern_kingdoms/stormwind_city.cpp index 3cfc99b67e1..e0dc65dc766 100644 --- a/src/scripts/eastern_kingdoms/stormwind_city.cpp +++ b/src/scripts/eastern_kingdoms/stormwind_city.cpp @@ -54,7 +54,7 @@ bool GossipHello_npc_archmage_malin(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_archmage_malin(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_archmage_malin(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -217,7 +217,7 @@ bool GossipHello_npc_lady_katrana_prestor(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_lady_katrana_prestor(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_lady_katrana_prestor(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -451,7 +451,7 @@ struct npc_marzon_silent_bladeAI : public ScriptedAI } } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -467,7 +467,7 @@ struct npc_marzon_silent_bladeAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp index 6f1112c2ca1..08d364d1808 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp @@ -66,7 +66,7 @@ struct mob_yennikuAI : public ScriptedAI return; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp index f32864fccf7..de17717e289 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp @@ -114,7 +114,7 @@ struct boss_baron_rivendareAI : public ScriptedAI summoned->AI()->AttackStart(pTarget); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(TYPE_BARON,DONE); diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp index e51ee03cc80..cff4fe3fbae 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp @@ -51,11 +51,11 @@ struct boss_baroness_anastariAI : public ScriptedAI //Possess_Timer = 35000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(TYPE_BARONESS,IN_PROGRESS); diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp index edb64c6b917..c12f7b9ad04 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp @@ -91,7 +91,7 @@ struct boss_cannon_master_willeyAI : public ScriptedAI SummonRifleman_Timer = 15000; } - void JustDied(Unit* Victim) + void JustDied(Unit* /*Victim*/) { me->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); me->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000); @@ -102,7 +102,7 @@ struct boss_cannon_master_willeyAI : public ScriptedAI me->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp index 0fd547d393e..a8489a7f549 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp @@ -93,7 +93,7 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI me->UpdateEntry(NPC_DATHROHAN); } - void JustDied(Unit* Victim) + void JustDied(Unit* /*Victim*/) { static uint32 uiCount = sizeof(m_aSummonPoint)/sizeof(SummonDef); @@ -103,7 +103,7 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILISECONDS); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp index 88f8b7571d1..89de7dbc207 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp @@ -63,12 +63,12 @@ struct boss_magistrate_barthilasAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { me->SetDisplayId(MODEL_HUMAN); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp index 046412e24b8..0c1cf011d5e 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp @@ -49,11 +49,11 @@ struct boss_maleki_the_pallidAI : public ScriptedAI DrainLife_Timer = 31000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(TYPE_PALLID,IN_PROGRESS); diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp index a3af7a702fb..ae7299071f4 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp @@ -51,11 +51,11 @@ struct boss_nerubenkanAI : public ScriptedAI RaiseUndeadScarab_Timer = 3000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(TYPE_NERUB,IN_PROGRESS); diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp index eab460fbcd2..905feb9fffc 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp @@ -81,7 +81,7 @@ struct boss_silver_hand_bossesAI : public ScriptedAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp index 2dc4e1af8b7..c04bae15468 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp @@ -55,7 +55,7 @@ struct boss_postmaster_malownAI : public ScriptedAI HasYelled = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp index 6c7cc8beec8..3a3ae60c9c9 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp @@ -47,11 +47,11 @@ struct boss_ramstein_the_gorgerAI : public ScriptedAI Knockout_Timer = 12000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { for (uint8 i = 0; i < 30; ++i) { diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp index 78e9acb9725..f15eb59ba47 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp @@ -40,7 +40,7 @@ struct boss_timmy_the_cruelAI : public ScriptedAI HasYelled = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (!HasYelled) { diff --git a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp index bc1643de076..ffeaa070a26 100644 --- a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp @@ -131,7 +131,7 @@ struct instance_stratholme : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -143,7 +143,7 @@ struct instance_stratholme : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp index 86690e5178a..035fca68b95 100644 --- a/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp @@ -86,7 +86,7 @@ struct mob_freed_soulAI : public ScriptedAI DoScriptText(RAND(SAY_ZAPPED0,SAY_ZAPPED1,SAY_ZAPPED2,SAY_ZAPPED3), me); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} }; CreatureAI* GetAI_mob_freed_soul(Creature* pCreature) @@ -119,7 +119,7 @@ struct mob_restless_soulAI : public ScriptedAI Tagged = false; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -138,7 +138,7 @@ struct mob_restless_soulAI : public ScriptedAI summoned->CastSpell(summoned,SPELL_SOUL_FREED,false); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (Tagged) me->SummonCreature(ENTRY_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 300000); @@ -188,15 +188,15 @@ struct mobs_spectral_ghostly_citizenAI : public ScriptedAI Tagged = false; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (!Tagged && spell->Id == SPELL_EGAN_BLASTER) Tagged = true; } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (Tagged) { diff --git a/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp b/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp index 8285e92c69e..6fe65cf963d 100644 --- a/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp +++ b/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp @@ -81,7 +81,7 @@ struct instance_sunken_temple : public ScriptedInstance s6 = false; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -95,7 +95,7 @@ struct instance_sunken_temple : public ScriptedInstance } } - virtual void Update(uint32 diff) // correct order goes form 1-6 + virtual void Update(uint32 /*diff*/) // correct order goes form 1-6 { switch(State) { diff --git a/src/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp b/src/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp index f3c130c0254..7f0ca126d78 100644 --- a/src/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp +++ b/src/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp @@ -32,12 +32,12 @@ EndContentData */ # at_malfurion_Stormrage_trigger #####*/ -bool AreaTrigger_at_malfurion_stormrage(Player* pPlayer, const AreaTriggerEntry *at) +bool AreaTrigger_at_malfurion_stormrage(Player* pPlayer, const AreaTriggerEntry * /*at*/) { if (ScriptedInstance* pInstance = pPlayer->GetInstanceData()) { if (!pPlayer->FindNearestCreature(15362,15)) - Unit* Malfurion = pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1.52, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); + pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1.52, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); return false; } return false; diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp index 22a360f7a88..59e58d6df1a 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp @@ -107,7 +107,7 @@ struct boss_brutallusAI : public ScriptedAI pInstance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(YELL_AGGRO, me); @@ -115,12 +115,12 @@ struct boss_brutallusAI : public ScriptedAI pInstance->SetData(DATA_BRUTALLUS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(YELL_KILL1,YELL_KILL2,YELL_KILL3), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(YELL_DEATH, me); diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp index 7b03d9ae52c..f38b3882e7a 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp @@ -146,7 +146,7 @@ struct boss_sacrolashAI : public ScriptedAI pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { DoZoneInCombat(); @@ -161,13 +161,13 @@ struct boss_sacrolashAI : public ScriptedAI pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { if (rand()%4 == 0) DoScriptText(RAND(YELL_SAC_KILL_1,YELL_SAC_KILL_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { // only if ALY death if (SisterDeath) @@ -406,7 +406,7 @@ struct boss_alythessAI : public Scripted_NoMovementAI pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { DoZoneInCombat(); @@ -452,7 +452,7 @@ struct boss_alythessAI : public Scripted_NoMovementAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { if (rand()%4 == 0) { @@ -460,7 +460,7 @@ struct boss_alythessAI : public Scripted_NoMovementAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (SisterDeath) { @@ -689,7 +689,7 @@ struct mob_shadow_imageAI : public ScriptedAI KillTimer = 15000; } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) { diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp index ed06964aef2..99c50ba8928 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp @@ -170,7 +170,7 @@ struct boss_felmystAI : public ScriptedAI pInstance->SetData(DATA_FELMYST_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { me->setActive(true); DoZoneInCombat(); @@ -194,7 +194,7 @@ struct boss_felmystAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(YELL_KILL1,YELL_KILL2), me); } @@ -204,7 +204,7 @@ struct boss_felmystAI : public ScriptedAI DoScriptText(YELL_BIRTH, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(YELL_DEATH, me); @@ -556,12 +556,12 @@ struct mob_felmyst_vaporAI : public ScriptedAI me->SetSpeed(MOVE_RUN, 0.8); } void Reset() {} - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); //DoCast(me, SPELL_VAPOR_FORCE, true); core bug } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!me->getVictim()) if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -579,10 +579,10 @@ struct mob_felmyst_trailAI : public ScriptedAI me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01); // core bug } void Reset() {} - void EnterCombat(Unit* who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) {} }; CreatureAI* GetAI_boss_felmyst(Creature* pCreature) diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp index f30cb749c37..7b404d101bf 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp @@ -343,7 +343,7 @@ struct boss_kalecgosAI : public ScriptedAI damage = 0; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { me->SetStandState(UNIT_STAND_STATE_STAND); DoScriptText(SAY_EVIL_AGGRO, me); @@ -353,12 +353,12 @@ struct boss_kalecgosAI : public ScriptedAI pInstance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_EVIL_SLAY1,SAY_EVIL_SLAY2), me); } - void MovementInform(uint32 type,uint32 id) + void MovementInform(uint32 type,uint32 /*id*/) { if (type != POINT_MOTION_TYPE) return; @@ -480,7 +480,7 @@ struct boss_sathrovarrAI : public ScriptedAI TeleportAllPlayersBack(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (Creature *Kalec = me->SummonCreature(MOB_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) { @@ -514,7 +514,7 @@ struct boss_sathrovarrAI : public ScriptedAI DoScriptText(RAND(SAY_SATH_SLAY1,SAY_SATH_SLAY2), me); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { DoScriptText(SAY_SATH_DEATH, me); me->GetMap()->CreatureRelocation(me, me->GetPositionX(), me->GetPositionY(), DRAGON_REALM_Z, me->GetOrientation()); diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp index 784a549d031..6e8ec122e9c 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp @@ -269,16 +269,16 @@ bool GOHello_go_orb_of_the_blue_flight(Player* pPlayer, GameObject* pGo) { if (pGo->GetUInt32Value(GAMEOBJECT_FACTION) == 35) { - ScriptedInstance* pInstance = pGo->GetInstanceData(); - float x,y,z; + //ScriptedInstance* pInstance = pGo->GetInstanceData(); + //float x,y,z; //float dx,dy,dz; pGo->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000); pPlayer->CastSpell(pPlayer, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, true); pGo->SetUInt32Value(GAMEOBJECT_FACTION, 0); - if (pInstance) - Creature* Kalec = Unit::GetCreature(*pPlayer, pInstance->GetData64(DATA_KALECGOS_KJ)); + //if (pInstance) + // Creature* Kalec = Unit::GetCreature(*pPlayer, pInstance->GetData64(DATA_KALECGOS_KJ)); //Kalec->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES); - pGo->GetPosition(x,y,z); + //pGo->GetPosition(x,y,z); // this won't work. need rewritten /* for (uint8 i = 0; i < 4; ++i) @@ -420,7 +420,7 @@ struct boss_kalecgos_kjAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!Searched) { @@ -528,7 +528,7 @@ struct boss_kiljaedenAI : public Scripted_NoMovementAI Summons.Summon(summoned); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_KJ_DEATH, me); @@ -536,7 +536,7 @@ struct boss_kiljaedenAI : public Scripted_NoMovementAI pInstance->SetData(DATA_KILJAEDEN_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KJ_SLAY1,SAY_KJ_SLAY2), me); } @@ -552,7 +552,7 @@ struct boss_kiljaedenAI : public Scripted_NoMovementAI CAST_AI(Scripted_NoMovementAI, Control->AI())->Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); DoScriptText(SAY_KJ_EMERGE, me); @@ -565,7 +565,7 @@ struct boss_kiljaedenAI : public Scripted_NoMovementAI 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); @@ -617,7 +617,7 @@ struct boss_kiljaedenAI : public Scripted_NoMovementAI case TIMER_LEGION_LIGHTNING: if (!me->IsNonMeleeSpellCasted(false)) { - Unit *RandomPlayer; + Unit *RandomPlayer = NULL; me->RemoveAurasDueToSpell(SPELL_SOUL_FLAY); for (uint8 z = 0; z < 6; ++z) { @@ -708,7 +708,7 @@ struct boss_kiljaedenAI : public Scripted_NoMovementAI TimerIsDeactiveted[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); @@ -914,7 +914,7 @@ struct mob_hand_of_the_deceiverAI : public ScriptedAI me->InterruptNonMeleeSpells(true); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (!pInstance) return; @@ -1026,7 +1026,7 @@ struct mob_volatile_felfire_fiendAI : public ScriptedAI LockedTarget = false; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (damage > me->GetHealth()) DoCast(me, SPELL_FELFIRE_FISSION, true); @@ -1180,7 +1180,7 @@ struct mob_shield_orbAI : public ScriptedAI } else Timer -= diff; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 /*id*/) { if (type != POINT_MOTION_TYPE) return; diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp index 2f284e77b09..9d11232e086 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp @@ -136,7 +136,7 @@ struct boss_entropiusAI : public ScriptedAI pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoCastAOE(SPELL_NEGATIVE_ENERGY_E, true); DoCast(me, SPELL_ENTROPIUS_SPAWN, false); @@ -163,7 +163,7 @@ struct boss_entropiusAI : public ScriptedAI Summons.Summon(summoned); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { Summons.DespawnAll(); @@ -241,7 +241,7 @@ struct boss_muruAI : public Scripted_NoMovementAI pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoCastAOE(SPELL_NEGATIVE_ENERGY,false); @@ -249,7 +249,7 @@ struct boss_muruAI : public Scripted_NoMovementAI pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (damage > me->GetHealth() && Phase == 1) { @@ -401,7 +401,7 @@ struct npc_muru_portalAI : public Scripted_NoMovementAI Summons.Summon(summoned); } - void SpellHit(Unit* caster, const SpellEntry* Spell) + void SpellHit(Unit* /*caster*/, const SpellEntry* Spell) { float x,y,z,o; me->GetHomePosition(x,y,z,o); @@ -456,7 +456,7 @@ struct npc_dark_fiendAI : public ScriptedAI me->addUnitState(UNIT_STAT_STUNNED); } - void SpellHit(Unit* caster, const SpellEntry* Spell) + void SpellHit(Unit* /*caster*/, const SpellEntry* Spell) { for (uint8 i = 0; i < 3; ++i) if (Spell->Effect[i] == 38) @@ -514,7 +514,7 @@ struct npc_void_sentinelAI : public ScriptedAI DoTeleportTo(x,y,71); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { for (uint8 i = 0; i < 8; ++i) me->SummonCreature(CREATURE_VOID_SPAWN, me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(), rand()%6, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000); diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp index cfc64ba18cd..94b7bf4b735 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp @@ -114,7 +114,7 @@ struct instance_sunwell_plateau : public ScriptedInstance return NULL; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -134,7 +134,7 @@ struct instance_sunwell_plateau : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades.cpp index 4a5280d7a3a..8b6d73df704 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades.cpp @@ -61,7 +61,7 @@ struct npc_calvin_montagueAI : public ScriptedAI me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); } - void EnterCombat(Unit* who) { } + void EnterCombat(Unit* /*who*/) {} void AttackedBy(Unit* pAttacker) { @@ -156,7 +156,7 @@ enum eMausoleum GO_DOOR = 176594 }; -bool GOHello_go_mausoleum_door(Player* pPlayer, GameObject* pGo) +bool GOHello_go_mausoleum_door(Player* pPlayer, GameObject* /*pGo*/) { if (pPlayer->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) return false; diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp index ca9f0f3d49f..cd3bc5fc219 100644 --- a/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp @@ -91,14 +91,14 @@ struct boss_archaedasAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { me->setFaction (14); me->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag (UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); } - void SpellHit (Unit* caster, const SpellEntry *spell) + void SpellHit (Unit* /*caster*/, const SpellEntry *spell) { // Being woken up from the altar, start the awaken sequence if (spell == GetSpellStore()->LookupEntry(SPELL_ARCHAEDAS_AWAKEN)) { @@ -109,7 +109,7 @@ struct boss_archaedasAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { me->MonsterYell(SAY_KILL,LANG_UNIVERSAL, NULL); DoPlaySoundToSet(me, SOUND_KILL); @@ -176,7 +176,7 @@ struct boss_archaedasAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied (Unit *killer) { + void JustDied (Unit * /*killer*/) { if (pInstance) { pInstance->SetData(NULL,3); // open the vault door @@ -228,7 +228,7 @@ struct mob_archaedas_minionsAI : public ScriptedAI me->RemoveAllAuras(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { me->setFaction (14); me->RemoveAllAuras(); @@ -237,7 +237,7 @@ struct mob_archaedas_minionsAI : public ScriptedAI amIAwake = true; } - void SpellHit (Unit* caster, const SpellEntry *spell) { + void SpellHit (Unit* /*caster*/, const SpellEntry *spell) { // time to wake up, start animation if (spell == GetSpellStore()->LookupEntry(SPELL_ARCHAEDAS_AWAKEN)){ Awaken_Timer = 5000; @@ -293,7 +293,7 @@ EndScriptData */ //uint64 altarOfArchaedasCount[5]; //int32 altarOfArchaedasCounter=0; -bool GOHello_go_altar_of_archaedas(Player* pPlayer, GameObject* pGo) +bool GOHello_go_altar_of_archaedas(Player* pPlayer, GameObject* /*pGo*/) { //bool alreadyUsed; //pGo->AddUse (); @@ -369,14 +369,14 @@ struct mob_stonekeepersAI : public ScriptedAI me->RemoveAllAuras(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { me->setFaction (14); me->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { //Return since we have no target @@ -386,7 +386,7 @@ struct mob_stonekeepersAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit *attacker) + void JustDied(Unit * /*attacker*/) { DoCast (me, SPELL_SELF_DESTRUCT,true); if (pInstance) @@ -414,7 +414,7 @@ EndScriptData */ //static uint64 altarOfTheKeeperCount[5]; //static uint32 altarOfTheKeeperCounter=0; -bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* pGo) +bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* /*pGo*/) { ScriptedInstance* pInstance = pPlayer->GetInstanceData(); if (!pInstance) diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp b/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp index f0b7cbbba6f..9b6d5dba642 100644 --- a/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp @@ -44,7 +44,7 @@ struct boss_ironayaAI : public ScriptedAI hasCastedWstomp = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp index 95e77c5c22a..a519ad678b7 100644 --- a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp @@ -55,7 +55,7 @@ struct instance_uldaman : public ScriptedInstance std::vector<uint64> earthenGuardian; std::vector<uint64> archaedasWallMinions; // minions lined up around the wall - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch (pGo->GetEntry()) { @@ -213,7 +213,7 @@ struct instance_uldaman : public ScriptedInstance } } - void SetData (uint32 type, uint32 data) + void SetData (uint32 /*type*/, uint32 data) { //error_log ("SetData: data = %d", data); if (data == 0) OpenDoor (altarOfTheKeeperTempleDoor); @@ -234,7 +234,7 @@ struct instance_uldaman : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch (pCreature->GetEntry()) { case 4857: // Stone Keeper diff --git a/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp index 01862739cb7..2bd8387efa5 100644 --- a/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp @@ -45,7 +45,7 @@ struct mob_jadespine_basiliskAI : public ScriptedAI Cslumber_Timer = 2000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -115,7 +115,7 @@ bool GossipHello_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreatu return true; } -bool GossipSelect_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/eastern_kingdoms/undercity.cpp b/src/scripts/eastern_kingdoms/undercity.cpp index da474fe6fd0..22eb3241874 100644 --- a/src/scripts/eastern_kingdoms/undercity.cpp +++ b/src/scripts/eastern_kingdoms/undercity.cpp @@ -70,7 +70,7 @@ struct npc_lady_sylvanas_windrunnerAI : public ScriptedAI targetGUID = 0; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void JustSummoned(Creature *summoned) { @@ -117,7 +117,7 @@ CreatureAI* GetAI_npc_lady_sylvanas_windrunner(Creature* pCreature) return new npc_lady_sylvanas_windrunnerAI (pCreature); } -bool ChooseReward_npc_lady_sylvanas_windrunner(Player* pPlayer, Creature* pCreature, const Quest *_Quest, uint32 slot) +bool ChooseReward_npc_lady_sylvanas_windrunner(Player* /*pPlayer*/, Creature* pCreature, const Quest *_Quest, uint32 /*slot*/) { if (_Quest->GetQuestId() == 9180) { @@ -153,7 +153,7 @@ struct npc_highborne_lamenterAI : public ScriptedAI EventCast = true; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -210,7 +210,7 @@ bool GossipHello_npc_parqual_fintallas(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_parqual_fintallas(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_parqual_fintallas(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/scripts/eastern_kingdoms/western_plaguelands.cpp b/src/scripts/eastern_kingdoms/western_plaguelands.cpp index 60b158aa042..d690d4b0984 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands.cpp @@ -61,7 +61,7 @@ bool GossipHello_npcs_dithers_and_arbington(Player* pPlayer, Creature* pCreature return true; } -bool GossipSelect_npcs_dithers_and_arbington(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npcs_dithers_and_arbington(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -123,7 +123,7 @@ bool GossipHello_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_myranda_the_hag(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { @@ -143,7 +143,7 @@ struct npc_the_scourge_cauldronAI : public ScriptedAI void Reset() {} - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void DoDie() { diff --git a/src/scripts/eastern_kingdoms/wetlands.cpp b/src/scripts/eastern_kingdoms/wetlands.cpp index 21120d31023..02f7abdf4c2 100644 --- a/src/scripts/eastern_kingdoms/wetlands.cpp +++ b/src/scripts/eastern_kingdoms/wetlands.cpp @@ -69,7 +69,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* /*pWho*/) { Player* pPlayer = GetPlayerForEscort(); @@ -99,7 +99,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI AttackStart(pAttacker); } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) { if (me->GetHealth()*100 < me->GetMaxHealth()*20) { diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp index 74b6a391be2..f516065cc03 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp @@ -112,7 +112,7 @@ struct boss_akilzonAI : public ScriptedAI SetWeather(WEATHER_STATE_FINE, 0.0f); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(me, SOUND_ONAGGRO); @@ -121,7 +121,7 @@ struct boss_akilzonAI : public ScriptedAI pInstance->SetData(DATA_AKILZONEVENT, IN_PROGRESS); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { me->MonsterYell(SAY_ONDEATH,LANG_UNIVERSAL,NULL); DoPlaySoundToSet(me, SOUND_ONDEATH); @@ -130,7 +130,7 @@ struct boss_akilzonAI : public ScriptedAI DespawnSummons(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { switch (urand(0,1)) { @@ -388,9 +388,9 @@ struct mob_soaring_eagleAI : public ScriptedAI me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } - void EnterCombat(Unit *who) {DoZoneInCombat();} + void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void MovementInform(uint32, uint32) { diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp index 1baaf524531..aee0a8a59ea 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp @@ -112,7 +112,7 @@ struct boss_halazziAI : public ScriptedAI EnterPhase(PHASE_LYNX); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS); @@ -130,7 +130,7 @@ struct boss_halazziAI : public ScriptedAI LynxGUID = summon->GetGUID(); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth() && Phase != PHASE_ENRAGE) damage = 0; @@ -298,7 +298,7 @@ struct boss_halazziAI : public ScriptedAI DoMeleeAttackIfReady(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { switch (urand(0,1)) { @@ -314,7 +314,7 @@ struct boss_halazziAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(DATA_HALAZZIEVENT, DONE); @@ -339,7 +339,7 @@ struct boss_spiritlynxAI : public ScriptedAI shredder_timer = 4000; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) damage = 0; @@ -351,7 +351,7 @@ struct boss_spiritlynxAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void EnterCombat(Unit *who) {/*DoZoneInCombat();*/} + void EnterCombat(Unit * /*who*/) {/*DoZoneInCombat();*/} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp index 73a18a97a50..17ab1f3c5b1 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp @@ -184,9 +184,9 @@ struct boss_hexlord_addAI : public ScriptedAI void Reset() {} - void EnterCombat(Unit* who) {DoZoneInCombat();} + void EnterCombat(Unit* /*who*/) {DoZoneInCombat();} - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (pInstance && pInstance->GetData(DATA_HEXLORDEVENT) != IN_PROGRESS) { @@ -242,7 +242,7 @@ struct boss_hex_lord_malacrassAI : public ScriptedAI me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS); @@ -264,7 +264,7 @@ struct boss_hex_lord_malacrassAI : public ScriptedAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { switch (urand(0,1)) { @@ -279,7 +279,7 @@ struct boss_hex_lord_malacrassAI : public ScriptedAI } } - void JustDied(Unit* victim) + void JustDied(Unit* /*victim*/) { if (pInstance) pInstance->SetData(DATA_HEXLORDEVENT, DONE); diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp index 7768c8f05cf..9ac54976241 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp @@ -155,7 +155,7 @@ struct boss_janalaiAI : public ScriptedAI HatchAllEggs(1); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); @@ -163,12 +163,12 @@ struct boss_janalaiAI : public ScriptedAI pInstance->SetData(DATA_JANALAIEVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_JANALAIEVENT, IN_PROGRESS); @@ -440,19 +440,19 @@ struct mob_janalai_firebombAI : public ScriptedAI void Reset() {} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_FIRE_BOMB_THROW) DoCast(me, SPELL_FIRE_BOMB_DUMMY, true); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* who) {} + void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) {} + void UpdateAI(const uint32 /*diff*/) {} }; CreatureAI* GetAI_mob_janalai_firebombAI(Creature* pCreature) @@ -520,9 +520,9 @@ struct mob_amanishi_hatcherAI : public ScriptedAI return num == 0; // if num == 0, no more templist } - void EnterCombat(Unit* who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void MovementInform(uint32, uint32) { if (waypoint == 5) @@ -604,7 +604,7 @@ struct mob_hatchlingAI : public ScriptedAI me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } - void EnterCombat(Unit *who) {/*DoZoneInCombat();*/} + void EnterCombat(Unit * /*who*/) {/*DoZoneInCombat();*/} void UpdateAI(const uint32 diff) { @@ -636,12 +636,12 @@ struct mob_eggAI : public ScriptedAI { mob_eggAI(Creature *c) : ScriptedAI(c){} void Reset() {} - void EnterCombat(Unit* who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) {} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_HATCH_EGG) { diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp index 64d9adf8e35..ae5c6596d2d 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp @@ -256,7 +256,7 @@ struct boss_nalorakkAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS); @@ -266,7 +266,7 @@ struct boss_nalorakkAI : public ScriptedAI DoZoneInCombat(); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(DATA_NALORAKKEVENT, DONE); @@ -275,7 +275,7 @@ struct boss_nalorakkAI : public ScriptedAI DoPlaySoundToSet(me, SOUND_YELL_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { switch (urand(0,1)) { diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp index b787dcc7f9b..91cfa728f89 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp @@ -210,7 +210,7 @@ struct boss_zuljinAI : public ScriptedAI //me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_ZULJINEVENT, IN_PROGRESS); @@ -223,7 +223,7 @@ struct boss_zuljinAI : public ScriptedAI EnterPhase(0); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (Intro_Timer) return; @@ -241,7 +241,7 @@ struct boss_zuljinAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(DATA_ZULJINEVENT, DONE); @@ -586,7 +586,7 @@ struct feather_vortexAI : public ScriptedAI void Reset() {} - void EnterCombat(Unit *pTarget) {} + void EnterCombat(Unit * /*pTarget*/) {} void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -594,7 +594,7 @@ struct feather_vortexAI : public ScriptedAI DoCast(caster, SPELL_ZAP_DAMAGE, true); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { //if the vortex reach the target, it change his target to another player if (me->IsWithinMeleeRange(me->getVictim())) diff --git a/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp b/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp index a06c30637c8..fae833efa3c 100644 --- a/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp @@ -104,7 +104,7 @@ struct instance_zulaman : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -117,7 +117,7 @@ struct instance_zulaman : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp b/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp index 7d44fe05670..067ae687644 100644 --- a/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp @@ -47,7 +47,7 @@ struct npc_forest_frogAI : public ScriptedAI void Reset() {} - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void DoSpawnRandom() { @@ -110,13 +110,13 @@ struct npc_zulaman_hostageAI : public ScriptedAI bool IsLoot; uint64 PlayerGUID; void Reset() {} - void EnterCombat(Unit *who) {} - void JustDied(Unit* who) + void EnterCombat(Unit * /*who*/) {} + void JustDied(Unit* /*who*/) { Player* pPlayer = Unit::GetPlayer(PlayerGUID); if (pPlayer) pPlayer->SendLoot(me->GetGUID(), LOOT_CORPSE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (IsLoot) DoCast(me, 7, false); @@ -130,7 +130,7 @@ bool GossipHello_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp index 334108d5d95..cbbe6c4dc4c 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "ScriptedPch.h" #include "zulgurub.h" -bool GOHello_go_gong_of_bethekk(Player* pPlayer, GameObject* pGo) +bool GOHello_go_gong_of_bethekk(Player* /*pPlayer*/, GameObject* pGo) { if (ScriptedInstance* m_pInstance = pGo->GetInstanceData()) { @@ -103,7 +103,7 @@ struct boss_arlokkAI : public ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); } @@ -117,7 +117,7 @@ struct boss_arlokkAI : public ScriptedAI me->ForcedDespawn(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp index 1e6827d3d3c..0201235be70 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp @@ -41,7 +41,7 @@ struct boss_gahzrankaAI : public ScriptedAI Slam_Timer = 17000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp index a2694f5f354..67de135674a 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp @@ -40,7 +40,7 @@ struct boss_grilekAI : public ScriptedAI GroundTremor_Timer = 8000 + rand()%8000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp index b1def2d619e..d7dd5020b74 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp @@ -94,7 +94,7 @@ struct boss_hakkarAI : public ScriptedAI Enraged = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp index 6107607f8f0..ca67d0842c3 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp @@ -42,7 +42,7 @@ struct boss_hazzarahAI : public ScriptedAI Illusions_Timer = 10000 + rand()%8000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp index 25d0679081f..fae05fcf384 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp @@ -77,13 +77,13 @@ struct boss_jeklikAI : public ScriptedAI PhaseTwo = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_BAT_FORM); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); @@ -228,7 +228,7 @@ struct mob_batriderAI : public ScriptedAI me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI (const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp index 77475ae3d41..58f91f85a95 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp @@ -58,7 +58,7 @@ struct boss_jindoAI : public ScriptedAI Teleport_Timer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -175,7 +175,7 @@ struct mob_healing_wardAI : public ScriptedAI Heal_Timer = 2000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -210,7 +210,7 @@ struct mob_shade_of_jindoAI : public ScriptedAI DoCast(me, SPELL_INVISIBLE, true); } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} void UpdateAI (const uint32 diff) { diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp index 4d982147557..4609605f3c1 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp @@ -123,7 +123,7 @@ struct boss_mandokirAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -281,9 +281,9 @@ struct mob_ohganAI : public ScriptedAI SunderArmor_Timer = 5000; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (m_pInstance) m_pInstance->SetData(TYPE_OHGAN, DONE); diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp index 608bc028b2d..21a7630018b 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp @@ -72,12 +72,12 @@ struct boss_marliAI : public ScriptedAI PhaseTwo = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); if (m_pInstance) @@ -213,7 +213,7 @@ struct mob_spawn_of_marliAI : public ScriptedAI LevelUp_Timer = 3000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp index 706d751e881..f7b01b26e19 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp @@ -54,7 +54,7 @@ struct boss_renatakiAI : public ScriptedAI Ambushed = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp index 0fe6e2570ee..179700d36e7 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp @@ -89,12 +89,12 @@ struct boss_thekalAI : public ScriptedAI WasDead = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); if (m_pInstance) @@ -277,7 +277,7 @@ struct mob_zealot_lorkhanAI : public ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -421,7 +421,7 @@ struct mob_zealot_zathAI : public ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp index e1778a107f2..ec1a7a142b5 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp @@ -73,11 +73,11 @@ struct boss_venoxisAI : public ScriptedAI InBerserk= false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); if (m_pInstance) diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp index ee4dda504b9..a71d7e0504a 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp @@ -40,7 +40,7 @@ struct boss_wushoolayAI : public ScriptedAI LightningWave_Timer = 8000 + rand()%8000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/examples/example_creature.cpp b/src/scripts/examples/example_creature.cpp index b24dd7bdf1b..856b680e2e6 100644 --- a/src/scripts/examples/example_creature.cpp +++ b/src/scripts/examples/example_creature.cpp @@ -133,7 +133,7 @@ struct example_creatureAI : public ScriptedAI //*** HANDLED FUNCTION *** //Our Receive emote function - void ReceiveEmote(Player* pPlayer, uint32 uiTextEmote) + void ReceiveEmote(Player* /*pPlayer*/, uint32 uiTextEmote) { me->HandleEmoteCommand(uiTextEmote); @@ -255,7 +255,7 @@ CreatureAI* GetAI_example_creature(Creature* pCreature) } //This function is called when the player clicks an option on the gossip menu -bool GossipSelect_example_creature(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_example_creature(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/scripts/examples/example_escort.cpp b/src/scripts/examples/example_escort.cpp index a4282d4c447..bf2b454bf8e 100644 --- a/src/scripts/examples/example_escort.cpp +++ b/src/scripts/examples/example_escort.cpp @@ -87,7 +87,7 @@ struct example_escortAI : public npc_escortAI } } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -186,7 +186,7 @@ bool GossipHello_example_escort(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_example_escort(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_example_escort(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { npc_escortAI* pEscortAI = CAST_AI(example_escortAI, pCreature->AI()); diff --git a/src/scripts/examples/example_gossip_codebox.cpp b/src/scripts/examples/example_gossip_codebox.cpp index 0506c9ada42..e208722784a 100644 --- a/src/scripts/examples/example_gossip_codebox.cpp +++ b/src/scripts/examples/example_gossip_codebox.cpp @@ -49,7 +49,7 @@ bool GossipHello_example_gossip_codebox(Player* pPlayer, Creature* pCreature) } //This function is called when the player clicks an option on the gossip menubool -bool GossipSelect_example_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_example_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { diff --git a/src/scripts/examples/example_misc.cpp b/src/scripts/examples/example_misc.cpp index e26220bfbb3..3c96cc0bae7 100644 --- a/src/scripts/examples/example_misc.cpp +++ b/src/scripts/examples/example_misc.cpp @@ -29,20 +29,20 @@ enum eSay SAY_HI = -1999925 }; -bool AT_example_areatrigger(Player* pPlayer, const AreaTriggerEntry *pAt) +bool AT_example_areatrigger(Player* pPlayer, const AreaTriggerEntry * /*pAt*/) { DoScriptText(SAY_HI, pPlayer); return true; } extern void LoadDatabase(); -bool ItemUse_example_item(Player* pPlayer, Item* pItem, SpellCastTargets const& scTargets) +bool ItemUse_example_item(Player* /*pPlayer*/, Item* /*pItem*/, SpellCastTargets const& /*scTargets*/) { sScriptMgr.LoadDatabase(); return true; } -bool GOHello_example_go_teleporter(Player* pPlayer, GameObject* pGo) +bool GOHello_example_go_teleporter(Player* pPlayer, GameObject* /*pGo*/) { pPlayer->TeleportTo(0, 1807.07f, 336.105f, 70.3975f, 0.0f); return false; diff --git a/src/scripts/kalimdor/ashenvale.cpp b/src/scripts/kalimdor/ashenvale.cpp index 07bb3bfa42f..94da61bbbbf 100644 --- a/src/scripts/kalimdor/ashenvale.cpp +++ b/src/scripts/kalimdor/ashenvale.cpp @@ -97,7 +97,7 @@ struct npc_torekAI : public npc_escortAI Completed = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { } @@ -192,7 +192,7 @@ struct npc_ruul_snowhoofAI : public npc_escortAI } } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void Reset() { diff --git a/src/scripts/kalimdor/azshara.cpp b/src/scripts/kalimdor/azshara.cpp index 7ec8fea9c42..937afe0ae5d 100644 --- a/src/scripts/kalimdor/azshara.cpp +++ b/src/scripts/kalimdor/azshara.cpp @@ -49,7 +49,7 @@ struct mobs_spitelashesAI : public ScriptedAI spellhit = false; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) { @@ -121,7 +121,7 @@ bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -383,7 +383,7 @@ struct mob_rizzle_sprysprocketAI : public ScriptedAI } } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void MovementInform(uint32 type, uint32 id) { @@ -411,7 +411,7 @@ bool GossipHello_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1 && pPlayer->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE) { @@ -470,14 +470,12 @@ struct mob_depth_chargeAI : public ScriptedAI } } - void AttackStart(Unit *who) + void AttackStart(Unit * /*who*/) { - return; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { - return; } }; diff --git a/src/scripts/kalimdor/azuremyst_isle.cpp b/src/scripts/kalimdor/azuremyst_isle.cpp index b6eb7e4c774..fe5e75f016d 100644 --- a/src/scripts/kalimdor/azuremyst_isle.cpp +++ b/src/scripts/kalimdor/azuremyst_isle.cpp @@ -86,7 +86,7 @@ struct npc_draenei_survivorAI : public ScriptedAI me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void MoveInLineOfSight(Unit *who) { @@ -257,7 +257,7 @@ bool GossipHello_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreatu return true; } -bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -287,16 +287,14 @@ struct npc_injured_draeneiAI : public ScriptedAI } } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit * /*who*/) { - return; //ignore everyone around them (won't aggro anything) } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { - return; } }; @@ -419,7 +417,7 @@ struct npc_geezleAI : public ScriptedAI StartEvent(); } - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} void StartEvent() { @@ -581,7 +579,7 @@ CreatureAI* GetAI_npc_nestlewood_owlkinAI(Creature* pCreature) return new npc_nestlewood_owlkinAI (pCreature); } -bool EffectDummyCreature_npc_nestlewood_owlkin(Unit *pCaster, uint32 spellId, uint32 effIndex, Creature *pCreatureTarget) +bool EffectDummyCreature_npc_nestlewood_owlkin(Unit * /*pCaster*/, uint32 spellId, uint32 effIndex, Creature *pCreatureTarget) { //always check spellid and effectindex if (spellId == SPELL_INOCULATE_OWLKIN && effIndex == 0) diff --git a/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp b/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp index 4c024668818..a3fd42a0fe7 100644 --- a/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp @@ -33,14 +33,14 @@ enum eSpells const Position HomePosition = {-815.817,-145.299,-25.870, 0}; -bool GoHello_blackfathom_altar(Player *pPlayer, GameObject* pGo) +bool GoHello_blackfathom_altar(Player *pPlayer, GameObject* /*pGo*/) { if (!pPlayer->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM,pPlayer); return true; } -bool GoHello_blackfathom_fire(Player *pPlayer, GameObject* pGo) +bool GoHello_blackfathom_fire(Player * /*pPlayer*/, GameObject* pGo) { ScriptedInstance *pInstance = pGo->GetInstanceData(); @@ -157,7 +157,7 @@ struct npc_blackfathom_deeps_eventAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (me->isSummon()) //we are not a normal spawn. if (pInstance) @@ -213,7 +213,7 @@ bool GossipHello_npc_morridune(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_morridune(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_morridune(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { diff --git a/src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp b/src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp index e60bee43596..a4b7a160be8 100644 --- a/src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp @@ -45,13 +45,13 @@ struct boss_aku_maiAI : public ScriptedAI pInstance->SetData(TYPE_AKU_MAI, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(TYPE_AKU_MAI, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(TYPE_AKU_MAI, DONE); diff --git a/src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp b/src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp index 83dfe43c28f..374a526f098 100644 --- a/src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp @@ -42,13 +42,13 @@ struct boss_gelihastAI : public ScriptedAI pInstance->SetData(TYPE_GELIHAST, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(TYPE_GELIHAST, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(TYPE_GELIHAST, DONE); diff --git a/src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp b/src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp index c0572b766f3..bd7e1014d1a 100644 --- a/src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp @@ -53,14 +53,14 @@ struct boss_kelrisAI : public ScriptedAI pInstance->SetData(TYPE_KELRIS, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) pInstance->SetData(TYPE_KELRIS, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); if (pInstance) diff --git a/src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp b/src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp index 0300b0737ce..a485684e699 100644 --- a/src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp @@ -82,7 +82,7 @@ struct instance_blackfathom_deeps : public ScriptedInstance uiDeathTimes = 0; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch (pCreature->GetEntry()) { @@ -95,7 +95,7 @@ struct instance_blackfathom_deeps : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/kalimdor/bloodmyst_isle.cpp b/src/scripts/kalimdor/bloodmyst_isle.cpp index 35078e96196..108d03b8976 100644 --- a/src/scripts/kalimdor/bloodmyst_isle.cpp +++ b/src/scripts/kalimdor/bloodmyst_isle.cpp @@ -43,7 +43,7 @@ struct mob_webbed_creatureAI : public ScriptedAI { } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { } @@ -99,7 +99,7 @@ bool GossipHello_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature return true; } -bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/kalimdor/boss_azuregos.cpp b/src/scripts/kalimdor/boss_azuregos.cpp index 894506937ff..8aeedfa199e 100644 --- a/src/scripts/kalimdor/boss_azuregos.cpp +++ b/src/scripts/kalimdor/boss_azuregos.cpp @@ -60,7 +60,7 @@ struct boss_azuregosAI : public ScriptedAI Enraged = false; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp index 8ea971d4556..287d3cf8e9b 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp @@ -80,7 +80,7 @@ struct boss_epochAI : public ScriptedAI pInstance->SetData(DATA_EPOCH_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -123,7 +123,7 @@ struct boss_epochAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -131,7 +131,7 @@ struct boss_epochAI : public ScriptedAI pInstance->SetData(DATA_EPOCH_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp index 6eb129c3c85..12cdf00f2a5 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp @@ -48,15 +48,15 @@ struct boss_infinite_corruptorAI : public ScriptedAI pInstance->SetData(DATA_INFINITE_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); } - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) { //Return since we have no target if (!UpdateVictim()) @@ -65,7 +65,7 @@ struct boss_infinite_corruptorAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_INFINITE_EVENT, DONE); diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp index cfd30d85de9..a39f3289a5a 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp @@ -105,7 +105,7 @@ struct boss_mal_ganisAI : public ScriptedAI pInstance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) @@ -225,7 +225,7 @@ struct boss_mal_ganisAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -237,7 +237,7 @@ struct boss_mal_ganisAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp index 0fa7ace3a16..eba9733c745 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp @@ -71,7 +71,7 @@ struct boss_meathookAI : public ScriptedAI pInstance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -107,7 +107,7 @@ struct boss_meathookAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -115,7 +115,7 @@ struct boss_meathookAI : public ScriptedAI pInstance->SetData(DATA_MEATHOOK_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp index 1fc97bd91ab..da1c8098517 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp @@ -87,7 +87,7 @@ struct boss_salrammAI : public ScriptedAI pInstance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -137,7 +137,7 @@ struct boss_salrammAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -145,7 +145,7 @@ struct boss_salrammAI : public ScriptedAI pInstance->SetData(DATA_SALRAMM_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp index 4c1ce891438..faaed2eb6db 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp @@ -289,12 +289,12 @@ struct npc_arthasAI : public npc_escortAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoCast(me, SPELL_ARTHAS_AURA); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) pInstance->SetData(DATA_ARTHAS_EVENT, FAIL); @@ -1155,7 +1155,7 @@ bool GossipHello_npc_arthas(Player* pPlayer, Creature* pCreature) } -bool GossipSelect_npc_arthas(Player *pPlayer, Creature *pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_arthas(Player *pPlayer, Creature *pCreature, uint32 /*sender*/, uint32 action) { npc_arthasAI* pAI = CAST_AI(npc_arthasAI,pCreature->AI()); diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp index ad04914a47c..73742a1e748 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp @@ -57,7 +57,7 @@ struct instance_culling_of_stratholme : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -82,7 +82,7 @@ struct instance_culling_of_stratholme : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp index 1b9a4e7d075..49cf7cd4433 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -61,7 +61,7 @@ struct boss_aeonusAI : public ScriptedAI Frenzy_Timer = 30000+rand()%15000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -81,7 +81,7 @@ struct boss_aeonusAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -92,7 +92,7 @@ struct boss_aeonusAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index 693db6124eb..1f2b4a80612 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -63,7 +63,7 @@ struct boss_chrono_lord_dejaAI : public ScriptedAI Attraction_Timer = 25000+rand()%10000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -83,12 +83,12 @@ struct boss_chrono_lord_dejaAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp index 465bd0256a2..04b4b020ead 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp @@ -62,17 +62,17 @@ struct boss_temporusAI : public ScriptedAI WingBuffet_Timer = 25000+rand()%10000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp index e29e0f33f0f..b0432a9b57c 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp @@ -119,7 +119,7 @@ struct npc_medivh_bmAI : public ScriptedAI } } - void AttackStart(Unit *who) + void AttackStart(Unit * /*who*/) { //if (pInstance && pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) //return; @@ -127,9 +127,9 @@ struct npc_medivh_bmAI : public ScriptedAI //ScriptedAI::AttackStart(who); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} - void SpellHit(Unit* caster, const SpellEntry* spell) + void SpellHit(Unit* /*caster*/, const SpellEntry* spell) { if (SpellCorrupt_Timer) return; @@ -272,7 +272,7 @@ struct npc_time_riftAI : public ScriptedAI else mWaveId = 1; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void DoSummonAtRift(uint32 creature_entry) { @@ -371,7 +371,7 @@ bool GossipHello_npc_saat(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_saat(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_saat(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp index 8684df4ca3f..d1280230808 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp @@ -118,7 +118,7 @@ struct instance_dark_portal : public ScriptedInstance pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0); } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { if (pCreature->GetEntry() == C_MEDIVH) MedivhGUID = pCreature->GetGUID(); diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp index f0f56f42c7b..14ce4a59b37 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp @@ -70,7 +70,7 @@ struct boss_anetheronAI : public hyjal_trashAI pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); @@ -78,7 +78,7 @@ struct boss_anetheronAI : public hyjal_trashAI me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { switch (urand(0,2)) { @@ -240,15 +240,15 @@ struct mob_towering_infernalAI : public ScriptedAI CheckTimer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { } diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp index 51e87178369..c643660216f 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp @@ -94,9 +94,9 @@ struct mob_ancient_wispAI : public ScriptedAI me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void DamageTaken(Unit* done_by, uint32 &damage) { damage = 0; } + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { damage = 0; } void UpdateAI(const uint32 diff) { @@ -122,9 +122,9 @@ struct mob_doomfireAI : public ScriptedAI void Reset() { } - void MoveInLineOfSight(Unit* who) { } - void EnterCombat(Unit* who) { } - void DamageTaken(Unit *done_by, uint32 &damage) { damage = 0; } + void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } }; /* This is the script for the Doomfire Spirit Mob. This mob simply follow players or @@ -150,9 +150,9 @@ struct mob_doomfire_targettingAI : public ScriptedAI TargetGUID = who->GetGUID(); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void DamageTaken(Unit *done_by, uint32 &damage) { damage = 0; } + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } void UpdateAI(const uint32 diff) { @@ -243,7 +243,7 @@ struct boss_archimondeAI : public hyjal_trashAI IsChanneling = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { me->InterruptSpell(CURRENT_CHANNELED_SPELL); DoScriptText(SAY_AGGRO, me); @@ -253,7 +253,7 @@ struct boss_archimondeAI : public hyjal_trashAI pInstance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); @@ -587,7 +587,7 @@ struct boss_archimondeAI : public hyjal_trashAI DoMeleeAttackIfReady(); } - void WaypointReached(uint32 i){} + void WaypointReached(uint32 /*i*/){} }; CreatureAI* GetAI_boss_archimonde(Creature* pCreature) diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp index a5d4ca6dfee..69e37f7f740 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp @@ -63,7 +63,7 @@ struct boss_azgalorAI : public hyjal_trashAI pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); @@ -71,7 +71,7 @@ struct boss_azgalorAI : public hyjal_trashAI me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { switch (urand(0,2)) { @@ -206,18 +206,16 @@ struct mob_lesser_doomguardAI : public hyjal_trashAI CheckTimer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { - } - void WaypointReached(uint32 i) + void WaypointReached(uint32 /*i*/) { - } void MoveInLineOfSight(Unit *who) @@ -226,9 +224,8 @@ struct mob_lesser_doomguardAI : public hyjal_trashAI AttackStart(who); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { - } void UpdateAI(const uint32 diff) diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp index f742d858080..b52d22842e3 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp @@ -58,7 +58,7 @@ struct boss_kazrogalAI : public hyjal_trashAI pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); @@ -66,7 +66,7 @@ struct boss_kazrogalAI : public hyjal_trashAI me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { switch (urand(0,2)) { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp index 1297000b99d..7465b997117 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp @@ -58,7 +58,7 @@ struct boss_rage_winterchillAI : public hyjal_trashAI pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); @@ -66,7 +66,7 @@ struct boss_rage_winterchillAI : public hyjal_trashAI me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { switch (urand(0,1)) { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp index ee1feecd400..16a050939cc 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp @@ -87,7 +87,7 @@ bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); switch(uiAction) @@ -156,7 +156,7 @@ bool GossipHello_npc_thrall(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_thrall(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_thrall(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); ai->DeSpawnVeins();//despawn the alliance veins @@ -201,7 +201,7 @@ bool GossipHello_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -214,7 +214,7 @@ bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature, pPlayer->SendNewItem(item,1,true,false,true); } pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); - hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); + CAST_AI(hyjalAI, pCreature->AI()); } return true; } diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp index 3e6c9a8cfe6..3c12b54f3f4 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp @@ -420,7 +420,7 @@ void hyjalAI::EnterEvadeMode() me->SetLootRecipient(NULL); } -void hyjalAI::EnterCombat(Unit *who) +void hyjalAI::EnterCombat(Unit * /*who*/) { if (IsDummy)return; for (uint8 i = 0; i < 3; ++i) @@ -908,7 +908,7 @@ void hyjalAI::UpdateAI(const uint32 diff) DoMeleeAttackIfReady(); } -void hyjalAI::JustDied(Unit* killer) +void hyjalAI::JustDied(Unit* /*killer*/) { if (IsDummy)return; me->Respawn(); diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h index 05c992f434a..5c75465b7b4 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h @@ -161,11 +161,11 @@ struct hyjalAI : public npc_escortAI void EnterEvadeMode(); // Send creature back to spawn location and evade. - void EnterCombat(Unit *who); // Used to reset cooldowns for our spells and to inform the raid that we're under attack + void EnterCombat(Unit * /*who*/); // Used to reset cooldowns for our spells and to inform the raid that we're under attack void UpdateAI(const uint32 diff); // Called to summon waves, check for boss deaths and to cast our spells. - void JustDied(Unit* killer); // Called on death, informs the raid that they have failed. + void JustDied(Unit* /*killer*/); // Called on death, informs the raid that they have failed. void SetFaction(uint32 _faction) // Set the faction to either Alliance or Horde in Hyjal { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp index 634d30e7cae..5dea18434a6 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp @@ -164,7 +164,7 @@ void hyjal_trashAI::DamageTaken(Unit *done_by, uint32 &damage) } } -void hyjal_trashAI::UpdateAI(const uint32 diff) +void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { if (IsOverrun && !SetupOverrun) { @@ -361,7 +361,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff) } } -void hyjal_trashAI::JustDied(Unit *victim) +void hyjal_trashAI::JustDied(Unit * /*victim*/) { if (!pInstance) return; @@ -404,7 +404,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI imol = false; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void WaypointReached(uint32 i) { @@ -549,7 +549,7 @@ struct mob_abominationAI : public hyjal_trashAI } } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -649,7 +649,7 @@ struct mob_ghoulAI : public hyjal_trashAI } } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -746,7 +746,7 @@ struct mob_necromancerAI : public hyjal_trashAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { switch (urand(0,2)) { @@ -764,7 +764,7 @@ struct mob_necromancerAI : public hyjal_trashAI } } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -855,7 +855,7 @@ struct mob_bansheeAI : public hyjal_trashAI } } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -949,7 +949,7 @@ struct mob_crypt_fiendAI : public hyjal_trashAI } } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -1034,7 +1034,7 @@ struct mob_fel_stalkerAI : public hyjal_trashAI } } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -1119,7 +1119,7 @@ struct mob_frost_wyrmAI : public hyjal_trashAI } } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_TRASH, 0);//signal trash is dead @@ -1131,7 +1131,7 @@ struct mob_frost_wyrmAI : public hyjal_trashAI me->GetMap()->CreatureRelocation(me, x,y,z,0); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -1335,7 +1335,7 @@ struct alliance_riflemanAI : public Scripted_NoMovementAI uint32 ExplodeTimer; - void JustDied(Unit* who) + void JustDied(Unit* /*who*/) { } @@ -1351,15 +1351,13 @@ struct alliance_riflemanAI : public Scripted_NoMovementAI if (who->isTargetableForAttack() && me->IsHostileTo(who)) { - float attackRadius = me->GetAttackDistance(who); + //float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, 30)) - { AttackStart(who); - } } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h index bd9f64417fc..21ee4bc06cc 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h @@ -13,7 +13,7 @@ struct hyjal_trashAI : public npc_escortAI void UpdateAI(const uint32 diff); - void JustDied(Unit* killer); + void JustDied(Unit* /*killer*/); void DamageTaken(Unit *done_by, uint32 &damage); diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp index a2a84a4cb55..e89d518c5bc 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp @@ -103,7 +103,7 @@ struct instance_mount_hyjal : public ScriptedInstance return false; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -127,7 +127,7 @@ struct instance_mount_hyjal : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp index 1060d42d4ea..91c9e274b83 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp @@ -64,19 +64,19 @@ struct boss_captain_skarlocAI : public ScriptedAI Consecration_Timer = 8000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { //This is not correct. Should taunt Thrall before engage in combat DoScriptText(SAY_TAUNT1, me); DoScriptText(SAY_TAUNT2, me); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp index 70c02e26bc9..2c2ad96ddb7 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp @@ -62,17 +62,17 @@ struct boss_epoch_hunterAI : public ScriptedAI Mda_Timer = 40000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp index 31f7f7647a2..dae0f5390b1 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp @@ -29,7 +29,7 @@ EndScriptData */ ## go_barrel_old_hillsbrad ######*/ -bool GOHello_go_barrel_old_hillsbrad(Player* pPlayer, GameObject* pGO) +bool GOHello_go_barrel_old_hillsbrad(Player* /*pPlayer*/, GameObject* pGO) { if (ScriptedInstance* pInstance = pGO->GetInstanceData()) { @@ -113,17 +113,17 @@ struct boss_lieutenant_drakeAI : public ScriptedAI ExplodingShout_Timer = 25000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); } diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp index 2c36f377b29..fa0b7c14595 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp @@ -89,7 +89,7 @@ struct instance_old_hillsbrad : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index 8b1583dae69..08c63954db5 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -61,7 +61,7 @@ bool GossipHello_npc_erozion(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -399,7 +399,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI me->Unmount(); me->SetSpeed(MOVE_RUN,SPEED_RUN); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1,SAY_TH_RANDOM_AGGRO2,SAY_TH_RANDOM_AGGRO3,SAY_TH_RANDOM_AGGRO4), me); if (me->IsMounted()) @@ -426,7 +426,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_TH_RANDOM_KILL1,SAY_TH_RANDOM_KILL2,SAY_TH_RANDOM_KILL3), me); } @@ -495,7 +495,7 @@ bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { ScriptedInstance* pInstance = pCreature->GetInstanceData(); switch(uiAction) @@ -575,7 +575,7 @@ struct npc_tarethaAI : public npc_escortAI } } void Reset() {} - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -598,7 +598,7 @@ bool GossipHello_npc_taretha(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_taretha(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_taretha(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { ScriptedInstance* pInstance = pCreature->GetInstanceData(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) diff --git a/src/scripts/kalimdor/darkshore.cpp b/src/scripts/kalimdor/darkshore.cpp index 97266b923b5..26b42a86422 100644 --- a/src/scripts/kalimdor/darkshore.cpp +++ b/src/scripts/kalimdor/darkshore.cpp @@ -95,7 +95,7 @@ struct npc_kerlonianAI : public FollowerAI } } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) { if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_AWAKEN) ClearSleeping(); @@ -270,7 +270,7 @@ struct npc_prospector_remtravelAI : public npc_escortAI DoScriptText(SAY_REM_AGGRO, me, who); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* /*pSummoned*/) { //unsure if it should be any //pSummoned->AI()->AttackStart(me); @@ -355,7 +355,7 @@ bool GossipHello_npc_threshwackonator(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_threshwackonator(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_threshwackonator(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/scripts/kalimdor/desolace.cpp b/src/scripts/kalimdor/desolace.cpp index e5fa9b02ed1..dd0d1ed3240 100644 --- a/src/scripts/kalimdor/desolace.cpp +++ b/src/scripts/kalimdor/desolace.cpp @@ -77,7 +77,7 @@ struct npc_aged_dying_ancient_kodoAI : public ScriptedAI } } - void SpellHit(Unit* pCaster, SpellEntry const* pSpell) + void SpellHit(Unit* /*pCaster*/, SpellEntry const* pSpell) { if (pSpell->Id == SPELL_KODO_KOMBO_GOSSIP) { @@ -161,7 +161,7 @@ bool GossipHello_npc_aged_dying_ancient_kodo(Player* pPlayer, Creature* pCreatur ## go_iruxos. Quest 5381 ######*/ -bool GOHello_go_iruxos(Player *pPlayer, GameObject* pGO) +bool GOHello_go_iruxos(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE) pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(),pPlayer->GetInnPosY(),pPlayer->GetInnPosZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); diff --git a/src/scripts/kalimdor/durotar.cpp b/src/scripts/kalimdor/durotar.cpp index 15ad1036770..160d3c3f2ec 100644 --- a/src/scripts/kalimdor/durotar.cpp +++ b/src/scripts/kalimdor/durotar.cpp @@ -51,7 +51,7 @@ struct npc_lazy_peonAI : public ScriptedAI work = false; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) { if (id == 1) work = true; diff --git a/src/scripts/kalimdor/dustwallow_marsh.cpp b/src/scripts/kalimdor/dustwallow_marsh.cpp index 0f4780fd559..a80c514eed7 100644 --- a/src/scripts/kalimdor/dustwallow_marsh.cpp +++ b/src/scripts/kalimdor/dustwallow_marsh.cpp @@ -196,7 +196,7 @@ bool GossipHello_npc_lady_jaina_proudmoore(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_lady_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_lady_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_SENDER_INFO) { @@ -231,7 +231,7 @@ bool GossipHello_npc_nat_pagle(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_nat_pagle(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_nat_pagle(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -296,7 +296,7 @@ struct npc_private_hendelAI : public ScriptedAI } }; -bool QuestAccept_npc_private_hendel(Player* pPlayer, Creature* pCreature, const Quest* pQuest) +bool QuestAccept_npc_private_hendel(Player* /*pPlayer*/, Creature* pCreature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT16) pCreature->setFaction(FACTION_HOSTILE); @@ -343,7 +343,7 @@ struct npc_zelfraxAI : public ScriptedAI } } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -365,7 +365,7 @@ struct npc_zelfraxAI : public ScriptedAI DoScriptText(SAY_ZELFRAX_2,me); } - void UpdateAI(uint32 const uiDiff) + void UpdateAI(uint32 const /*uiDiff*/) { if (!UpdateVictim()) return; diff --git a/src/scripts/kalimdor/felwood.cpp b/src/scripts/kalimdor/felwood.cpp index 122e581ca8b..01da356a63e 100644 --- a/src/scripts/kalimdor/felwood.cpp +++ b/src/scripts/kalimdor/felwood.cpp @@ -67,7 +67,7 @@ bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCrea return true; } -bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/scripts/kalimdor/feralas.cpp b/src/scripts/kalimdor/feralas.cpp index 8f8a1f435f2..2a87de1a67c 100644 --- a/src/scripts/kalimdor/feralas.cpp +++ b/src/scripts/kalimdor/feralas.cpp @@ -42,7 +42,7 @@ bool GossipHello_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -126,7 +126,7 @@ struct npc_oox22feAI : public npc_escortAI me->SetStandState(UNIT_STAND_STATE_DEAD); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { //For an small probability the npc says something when he get aggro if (urand(0,9) > 7) diff --git a/src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp b/src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp index eac460846d0..6f6b9d1baa9 100644 --- a/src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp +++ b/src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp @@ -42,9 +42,9 @@ struct celebras_the_cursedAI : public ScriptedAI CorruptForces_Timer = 30000; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { me->SummonCreature(13716, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 600000); } diff --git a/src/scripts/kalimdor/maraudon/boss_landslide.cpp b/src/scripts/kalimdor/maraudon/boss_landslide.cpp index 894bb97637f..d5b03ff218f 100644 --- a/src/scripts/kalimdor/maraudon/boss_landslide.cpp +++ b/src/scripts/kalimdor/maraudon/boss_landslide.cpp @@ -42,7 +42,7 @@ struct boss_landslideAI : public ScriptedAI Landslide_Timer = 0; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/kalimdor/maraudon/boss_noxxion.cpp b/src/scripts/kalimdor/maraudon/boss_noxxion.cpp index 3860e2d8777..b49b1a5d71f 100644 --- a/src/scripts/kalimdor/maraudon/boss_noxxion.cpp +++ b/src/scripts/kalimdor/maraudon/boss_noxxion.cpp @@ -45,7 +45,7 @@ struct boss_noxxionAI : public ScriptedAI Invisible = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp b/src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp index ca11e11ccc2..963863e89c8 100644 --- a/src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp +++ b/src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp @@ -45,11 +45,11 @@ struct boss_ptheradrasAI : public ScriptedAI RepulsiveGaze_Timer = 23000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void JustDied(Unit* Killer) + void JustDied(Unit* /*killer*/) { me->SummonCreature(12238,28.067,61.875,-123.405,4.67,TEMPSUMMON_TIMED_DESPAWN,600000); } diff --git a/src/scripts/kalimdor/moonglade.cpp b/src/scripts/kalimdor/moonglade.cpp index 3bdec51f0aa..16c78f20812 100644 --- a/src/scripts/kalimdor/moonglade.cpp +++ b/src/scripts/kalimdor/moonglade.cpp @@ -70,7 +70,7 @@ bool GossipHello_npc_bunthen_plainswind(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -112,7 +112,7 @@ bool GossipHello_npc_great_bear_spirit(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -169,7 +169,7 @@ bool GossipHello_npc_silva_filnaveth(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_silva_filnaveth(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_silva_filnaveth(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -284,7 +284,7 @@ public: } } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (!PlayerGUID) return; diff --git a/src/scripts/kalimdor/mulgore.cpp b/src/scripts/kalimdor/mulgore.cpp index 464f0d3a255..c87e5e36dad 100644 --- a/src/scripts/kalimdor/mulgore.cpp +++ b/src/scripts/kalimdor/mulgore.cpp @@ -49,7 +49,7 @@ bool GossipHello_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) pPlayer->SEND_GOSSIP_MENU(523, pCreature->GetGUID()); @@ -255,7 +255,7 @@ struct npc_plains_visionAI : public ScriptedAI amountWP = 49; } - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} void MovementInform(uint32 type, uint32 id) { @@ -274,7 +274,7 @@ struct npc_plains_visionAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (newWaypoint) { diff --git a/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp b/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp index 219a1327575..6bbe272df29 100644 --- a/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp +++ b/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp @@ -147,7 +147,7 @@ struct boss_onyxiaAI : public ScriptedAI m_bIsSummoningLairGuards = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); me->SetInCombatWithZone(); @@ -161,12 +161,12 @@ struct boss_onyxiaAI : public ScriptedAI ++m_uiSummonCount; } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(SAY_KILL, me); } - void SpellHit(Unit *pCaster, const SpellEntry* pSpell) + void SpellHit(Unit * /*pCaster*/, const SpellEntry* pSpell) { if (pSpell->Id == SPELL_BREATH_EAST_TO_WEST || pSpell->Id == SPELL_BREATH_WEST_TO_EAST || diff --git a/src/scripts/kalimdor/orgrimmar.cpp b/src/scripts/kalimdor/orgrimmar.cpp index 639885e41a1..71fa4381e9d 100644 --- a/src/scripts/kalimdor/orgrimmar.cpp +++ b/src/scripts/kalimdor/orgrimmar.cpp @@ -49,7 +49,7 @@ bool GossipHello_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -93,7 +93,7 @@ struct npc_shenthulAI : public ScriptedAI PlayerGUID = 0; } - void EnterCombat(Unit* who) { } + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -185,7 +185,7 @@ struct npc_thrall_warchiefAI : public ScriptedAI Shock_Timer = 8000; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -224,7 +224,7 @@ bool GossipHello_npc_thrall_warchief(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_thrall_warchief(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_thrall_warchief(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp index 25b6af4ddfe..711c4f0b2c1 100644 --- a/src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp +++ b/src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp @@ -55,7 +55,7 @@ struct boss_amnennar_the_coldbringerAI : public ScriptedAI Hp = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp b/src/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp index 53fd62e1951..04904f08a57 100644 --- a/src/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp +++ b/src/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp @@ -90,7 +90,7 @@ struct instance_razorfen_downs : public ScriptedInstance OUT_LOAD_INST_DATA_COMPLETE; } - void OnGameObjectCreate(GameObject* pGo, bool bAdd) + void OnGameObjectCreate(GameObject* pGo, bool /*bAdd*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp b/src/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp index c6fdfe806ae..5d0ebee56dd 100644 --- a/src/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp +++ b/src/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp @@ -57,7 +57,7 @@ bool GossipHello_npc_henry_stern (Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_henry_stern (Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_henry_stern (Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { @@ -78,7 +78,7 @@ bool GossipSelect_npc_henry_stern (Player* pPlayer, Creature* pCreature, uint32 ## go_gong ######*/ -bool GOHello_go_gong(Player* pPlayer, GameObject* pGO) +bool GOHello_go_gong(Player* /*pPlayer*/, GameObject* pGO) { //basic support, not blizzlike data is missing... ScriptedInstance* pInstance = pGO->GetInstanceData(); @@ -131,7 +131,7 @@ struct npc_tomb_creatureAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) pInstance->SetData(DATA_GONG_WAVES,pInstance->GetData(DATA_GONG_WAVES)+1); diff --git a/src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp b/src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp index 714141cc0b0..8a92d3d4d89 100644 --- a/src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp +++ b/src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp @@ -57,7 +57,7 @@ struct instance_razorfen_kraul : public ScriptedInstance return NULL; } - void OnGameObjectCreate(GameObject* pGo, bool apply) + void OnGameObjectCreate(GameObject* pGo, bool /*apply*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp b/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp index ae75d5f8f8c..95592c362b2 100644 --- a/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp +++ b/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp @@ -102,7 +102,7 @@ struct npc_willixAI : public npc_escortAI void Reset() {} - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO1, me, NULL); } @@ -112,7 +112,7 @@ struct npc_willixAI : public npc_escortAI summoned->AI()->AttackStart(me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (Player* pPlayer = GetPlayerForEscort()) CAST_PLR(pPlayer)->FailQuest(QUEST_WILLIX_THE_IMPORTER); diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp index 080c5c8d392..f6dc75558c8 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp @@ -62,13 +62,13 @@ struct boss_ayamissAI : public ScriptedAI pInstance->SetData(DATA_AYAMISS_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_AYAMISS_EVENT, IN_PROGRESS); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) pInstance->SetData(DATA_AYAMISS_EVENT, DONE); diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp index 1f4e0c8d93b..86a2c559543 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp @@ -44,13 +44,13 @@ struct boss_buruAI : public ScriptedAI pInstance->SetData(DATA_BURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_BURU_EVENT, IN_PROGRESS); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) pInstance->SetData(DATA_BURU_EVENT, DONE); diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp index 65654b3008d..44f11bf4b60 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp @@ -63,13 +63,13 @@ struct boss_kurinnaxxAI : public ScriptedAI pInstance->SetData(DATA_KURINNAXX_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_KURINNAXX_EVENT, IN_PROGRESS); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) pInstance->SetData(DATA_KURINNAXX_EVENT, DONE); diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp index 9d93628f7da..1882adc8fbb 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp @@ -76,7 +76,7 @@ struct boss_moamAI : public ScriptedAI pInstance->SetData(DATA_MOAM_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(EMOTE_AGGRO, me); @@ -84,7 +84,7 @@ struct boss_moamAI : public ScriptedAI pInstance->SetData(DATA_MOAM_EVENT, IN_PROGRESS); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) pInstance->SetData(DATA_MOAM_EVENT, DONE); diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp index 36ccdefd8f6..57ba8d9da7f 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp @@ -52,13 +52,13 @@ struct boss_ossirianAI : public ScriptedAI pInstance->SetData(DATA_OSSIRIAN_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_OSSIRIAN_EVENT, IN_PROGRESS); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) pInstance->SetData(DATA_OSSIRIAN_EVENT, DONE); diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp index d3fb028910c..5be60dc0ca0 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp @@ -58,13 +58,13 @@ struct boss_rajaxxAI : public ScriptedAI pInstance->SetData(DATA_RAJAXX_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_RAJAXX_EVENT, IN_PROGRESS); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) pInstance->SetData(DATA_RAJAXX_EVENT, DONE); diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp index 92faac64f13..ba7471bdbd2 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp @@ -68,7 +68,7 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch (pCreature->GetEntry()) { diff --git a/src/scripts/kalimdor/silithus.cpp b/src/scripts/kalimdor/silithus.cpp index 089dc3ed849..d7495b4187e 100644 --- a/src/scripts/kalimdor/silithus.cpp +++ b/src/scripts/kalimdor/silithus.cpp @@ -54,7 +54,7 @@ bool GossipHello_npc_highlord_demitrian(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_highlord_demitrian(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_highlord_demitrian(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -138,7 +138,7 @@ bool GossipHello_npcs_rutgar_and_frankal(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npcs_rutgar_and_frankal(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npcs_rutgar_and_frankal(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -793,13 +793,13 @@ struct mob_qiraj_war_spawnAI : public ScriptedAI hasTarget = false; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* slayer); void UpdateAI(const uint32 diff) { - Unit *pTarget; - Player* plr = me->GetPlayer(PlayerGUID); + Unit *pTarget = NULL; + //Player* plr = me->GetPlayer(PlayerGUID); if (!Timers) { @@ -912,12 +912,12 @@ struct npc_anachronos_quest_triggerAI : public ScriptedAI void SummonNextWave() { - uint8 count = WavesInfo[WaveCount].SpawnCount; + //uint8 count = WavesInfo[WaveCount].SpawnCount; uint8 locIndex = WavesInfo[WaveCount].UsedSpawnPoint; srand(time(NULL));//initializing random seed - uint8 KaldoreiSoldierCount = 0; - uint8 AnubisathConquerorCount = 0; - uint8 QirajiWaspCount = 0; + //uint8 KaldoreiSoldierCount = 0; + //uint8 AnubisathConquerorCount = 0; + //uint8 QirajiWaspCount = 0; for (uint8 i = 0; i < 67; ++i) { Creature* Spawn = NULL; @@ -1017,7 +1017,7 @@ struct npc_anachronos_quest_triggerAI : public ScriptedAI EnterEvadeMode(); }; }; -void mob_qiraj_war_spawnAI::JustDied(Unit* slayer) +void mob_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/) { me->RemoveCorpse(); if (Creature* Mob = (Unit::GetCreature(*me, MobGUID))) diff --git a/src/scripts/kalimdor/stonetalon_mountains.cpp b/src/scripts/kalimdor/stonetalon_mountains.cpp index b2fa410a2e7..6e627948788 100644 --- a/src/scripts/kalimdor/stonetalon_mountains.cpp +++ b/src/scripts/kalimdor/stonetalon_mountains.cpp @@ -60,7 +60,7 @@ bool GossipHello_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/scripts/kalimdor/tanaris.cpp b/src/scripts/kalimdor/tanaris.cpp index 57e6b0ee061..d7845c21f61 100644 --- a/src/scripts/kalimdor/tanaris.cpp +++ b/src/scripts/kalimdor/tanaris.cpp @@ -204,7 +204,7 @@ struct npc_custodian_of_timeAI : public npc_escortAI } } - void EnterCombat(Unit* who) { } + void EnterCombat(Unit* /*who*/) {} void Reset() { } void UpdateAI(const uint32 diff) @@ -235,7 +235,7 @@ bool GossipHello_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -265,7 +265,7 @@ bool GossipHello_npc_steward_of_time(Player* pPlayer, Creature* pCreature) return true; } -bool QuestAccept_npc_steward_of_time(Player* pPlayer, Creature* pCreature, Quest const *quest) +bool QuestAccept_npc_steward_of_time(Player* pPlayer, Creature* /*pCreature*/, Quest const *quest) { if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) @@ -273,7 +273,7 @@ bool QuestAccept_npc_steward_of_time(Player* pPlayer, Creature* pCreature, Quest return false; } -bool GossipSelect_npc_steward_of_time(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_steward_of_time(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) @@ -305,7 +305,7 @@ bool GossipHello_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCrea return true; } -bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -397,7 +397,7 @@ struct npc_OOX17AI : public npc_escortAI void Reset(){} - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_OOX_AGGRO1,SAY_OOX_AGGRO2), me); } diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp index d5c22e5ad8e..f6e3b0c741b 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp @@ -61,11 +61,11 @@ struct boss_kriAI : public ScriptedAI Death = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -144,7 +144,7 @@ struct boss_vemAI : public ScriptedAI Enraged = false; } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -156,7 +156,7 @@ struct boss_vemAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -225,7 +225,7 @@ struct boss_yaujAI : public ScriptedAI VemDead = false; } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -244,7 +244,7 @@ struct boss_yaujAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp index 945b1b7df3b..3e42d16be3a 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp @@ -219,7 +219,7 @@ struct eye_of_cthunAI : public Scripted_NoMovementAI pPortal->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); if (pInst) @@ -404,7 +404,7 @@ struct eye_of_cthunAI : public Scripted_NoMovementAI } } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { //No instance if (!pInst) @@ -522,7 +522,7 @@ struct cthunAI : public Scripted_NoMovementAI pInst->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } @@ -850,13 +850,13 @@ struct cthunAI : public Scripted_NoMovementAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInst) pInst->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { //No instance if (!pInst) @@ -912,7 +912,7 @@ struct eye_tentacleAI : public Scripted_NoMovementAI uint32 KillSelfTimer; uint64 Portal; - void JustDied(Unit* who) + void JustDied(Unit* /*who*/) { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); @@ -927,7 +927,7 @@ struct eye_tentacleAI : public Scripted_NoMovementAI KillSelfTimer = 35000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } @@ -976,7 +976,7 @@ struct claw_tentacleAI : public Scripted_NoMovementAI uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* who) + void JustDied(Unit* /*who*/) { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); @@ -990,7 +990,7 @@ struct claw_tentacleAI : public Scripted_NoMovementAI EvadeTimer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } @@ -1073,7 +1073,7 @@ struct giant_claw_tentacleAI : public Scripted_NoMovementAI uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* who) + void JustDied(Unit* /*who*/) { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); @@ -1088,7 +1088,7 @@ struct giant_claw_tentacleAI : public Scripted_NoMovementAI EvadeTimer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } @@ -1177,7 +1177,7 @@ struct giant_eye_tentacleAI : public Scripted_NoMovementAI uint32 BeamTimer; uint64 Portal; - void JustDied(Unit* who) + void JustDied(Unit* /*who*/) { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); @@ -1189,7 +1189,7 @@ struct giant_eye_tentacleAI : public Scripted_NoMovementAI BeamTimer = 500; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } @@ -1220,7 +1220,7 @@ struct flesh_tentacleAI : public Scripted_NoMovementAI SetCombatMovement(false); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (CAST_SUM(me)) if (Creature* pSummoner = CAST_CRE(CAST_SUM(me)->GetSummoner())) diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp index cb4e4944d41..32d5ec1c3df 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp @@ -80,7 +80,7 @@ struct boss_fankrissAI : public ScriptedAI Spawn->AI()->AttackStart(victim); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp index c8c583334fe..f0e3a425edd 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp @@ -60,7 +60,7 @@ struct boss_huhuranAI : public ScriptedAI Berserk = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp index 2dce8d5c710..1dd642c38f4 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp @@ -58,7 +58,7 @@ struct boss_ouroAI : public ScriptedAI Submerged = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoCast(me->getVictim(), SPELL_BIRTH); } diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp index 4d5237b07ad..282a25b7215 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp @@ -67,17 +67,17 @@ struct boss_sarturaAI : public ScriptedAI } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_SLAY, me); } @@ -195,7 +195,7 @@ struct mob_sartura_royal_guardAI : public ScriptedAI AggroReset = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp index fb0c0371c04..7e52bed750c 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp @@ -88,18 +88,18 @@ struct boss_skeramAI : public ScriptedAI me->setDeathState(JUST_DIED); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (!IsImage) DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (IsImage || Images75) return; diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp index 980e81f292f..a0a9723cd3c 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -101,7 +101,7 @@ struct boss_twinemperorsAI : public ScriptedAI return NULL; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { Unit *pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -118,7 +118,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { Creature *pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -132,12 +132,12 @@ struct boss_twinemperorsAI : public ScriptedAI DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_DEATH : SOUND_VN_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { DoZoneInCombat(); Creature *pOtherBoss = GetOtherBoss(); @@ -172,8 +172,6 @@ struct boss_twinemperorsAI : public ScriptedAI #define HEAL_BROTHER_AMOUNT 30000.0f uint32 largerAmount = (uint32)((HEAL_BROTHER_AMOUNT * mult) - HEAL_BROTHER_AMOUNT); - uint32 myh = me->GetHealth(); - uint32 hish = pOtherBoss->GetHealth(); if (mytotal > histotal) { uint32 h = me->GetHealth()+largerAmount; diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp index 633a209ff77..1125a0c8623 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp @@ -59,7 +59,7 @@ struct instance_temple_of_ahnqiraj : public ScriptedInstance CthunPhase = 0; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch (pCreature->GetEntry()) { diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index 7badb7562db..074f9ed68ae 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -137,7 +137,7 @@ struct aqsentinelAI : public ScriptedAI } } - void AddSentinelsNear(Unit *nears) + void AddSentinelsNear(Unit * /*nears*/) { std::list<Creature*> assistList; me->GetCreatureListWithEntryInGrid(assistList,15264,70.0f); @@ -221,7 +221,7 @@ struct aqsentinelAI : public ScriptedAI me->AddAura(id, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (gatherOthersWhenAggro) GetOtherSentinels(who); @@ -230,7 +230,7 @@ struct aqsentinelAI : public ScriptedAI DoZoneInCombat(); } - void JustDied(Unit* who) + void JustDied(Unit* /*who*/) { for (int ni=0; ni<3; ++ni) { @@ -259,7 +259,7 @@ struct aqsentinelAI : public ScriptedAI return NULL; } - Unit* GetAuraEffectTriggerTarget(uint32 spellId, uint8 effIndex) const + Unit* GetAuraEffectTriggerTarget(uint32 spellId, uint8 /*effIndex*/) const { switch (spellId) { diff --git a/src/scripts/kalimdor/the_barrens.cpp b/src/scripts/kalimdor/the_barrens.cpp index 007e5e4b372..04daac96877 100644 --- a/src/scripts/kalimdor/the_barrens.cpp +++ b/src/scripts/kalimdor/the_barrens.cpp @@ -53,7 +53,7 @@ bool GossipHello_npc_beaten_corpse(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF +1) { @@ -176,7 +176,7 @@ bool GossipHello_npc_sputtervalve(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -230,7 +230,7 @@ struct npc_taskmaster_fizzuleAI : public ScriptedAI me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { @@ -241,7 +241,7 @@ struct npc_taskmaster_fizzuleAI : public ScriptedAI } } - void EnterCombat(Unit* who) { } + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -260,7 +260,7 @@ struct npc_taskmaster_fizzuleAI : public ScriptedAI DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* pPlayer, uint32 emote) + void ReceiveEmote(Player* /*pPlayer*/, uint32 emote) { if (emote == TEXTEMOTE_SALUTE) { @@ -339,7 +339,7 @@ struct npc_twiggy_flatheadAI : public ScriptedAI BigWill = 0; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void MoveInLineOfSight(Unit *who) { @@ -352,7 +352,7 @@ struct npc_twiggy_flatheadAI : public ScriptedAI } } - void KilledUnit(Unit *victim) { } + void KilledUnit(Unit * /*victim*/) { } void UpdateAI(const uint32 diff) { diff --git a/src/scripts/kalimdor/thousand_needles.cpp b/src/scripts/kalimdor/thousand_needles.cpp index 59aac7ba233..3f54a62dd0b 100644 --- a/src/scripts/kalimdor/thousand_needles.cpp +++ b/src/scripts/kalimdor/thousand_needles.cpp @@ -350,7 +350,7 @@ bool GossipHello_npc_plucky(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_plucky(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_plucky(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -398,7 +398,7 @@ struct npc_enraged_pantherAI : public ScriptedAI me->SetReactState(REACT_PASSIVE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; diff --git a/src/scripts/kalimdor/thunder_bluff.cpp b/src/scripts/kalimdor/thunder_bluff.cpp index f622acbd993..288f00946f0 100644 --- a/src/scripts/kalimdor/thunder_bluff.cpp +++ b/src/scripts/kalimdor/thunder_bluff.cpp @@ -54,7 +54,7 @@ struct npc_cairne_bloodhoofAI : public ScriptedAI Uppercut_Timer = 10000; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -114,7 +114,7 @@ bool GossipHello_npc_cairne_bloodhoof(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_cairne_bloodhoof(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_cairne_bloodhoof(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_SENDER_INFO) { diff --git a/src/scripts/kalimdor/ungoro_crater.cpp b/src/scripts/kalimdor/ungoro_crater.cpp index 7b20eafeae2..4ca7b2fb9e0 100644 --- a/src/scripts/kalimdor/ungoro_crater.cpp +++ b/src/scripts/kalimdor/ungoro_crater.cpp @@ -94,7 +94,7 @@ struct npc_ameAI : public npc_escortAI summoned->AI()->AttackStart(me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (Player* pPlayer = GetPlayerForEscort()) pPlayer->FailQuest(QUEST_CHASING_AME); @@ -205,7 +205,7 @@ struct npc_ringoAI : public FollowerAI } } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) { if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_REVIVE_RINGO) ClearFaint(); diff --git a/src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp b/src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp index 432e2994507..287b5db6d57 100644 --- a/src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp +++ b/src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp @@ -43,7 +43,7 @@ struct instance_wailing_caverns : public ScriptedInstance NaralexGUID = 0; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { if (pCreature->GetEntry() == DATA_NARALEX) NaralexGUID = pCreature->GetGUID(); diff --git a/src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp b/src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp index 6eed1b80e1d..544c119fc93 100644 --- a/src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp +++ b/src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp @@ -132,7 +132,7 @@ struct npc_disciple_of_naralexAI : public npc_escortAI DoScriptText(SAY_ATTACKED, me, who); } - void JustDied(Unit *slayer) + void JustDied(Unit * /*slayer*/) { if (pInstance) { @@ -362,7 +362,7 @@ bool GossipHello_npc_disciple_of_naralex(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_disciple_of_naralex(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_disciple_of_naralex(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { ScriptedInstance *pInstance = pCreature->GetInstanceData(); if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) diff --git a/src/scripts/kalimdor/winterspring.cpp b/src/scripts/kalimdor/winterspring.cpp index 34d5ffed61c..a284f32aeaa 100644 --- a/src/scripts/kalimdor/winterspring.cpp +++ b/src/scripts/kalimdor/winterspring.cpp @@ -54,7 +54,7 @@ bool GossipHello_npc_lorax(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_lorax(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_lorax(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -103,7 +103,7 @@ bool GossipHello_npc_rivern_frostwind(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_rivern_frostwind(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_rivern_frostwind(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -132,7 +132,7 @@ bool GossipHello_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp b/src/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp index c26a3bd108b..530ef30f44c 100644 --- a/src/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp +++ b/src/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp @@ -31,7 +31,7 @@ struct instance_zulfarrak : public ScriptedInstance GahzRillaEncounter = NOT_STARTED; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { if (pCreature->GetEntry() == NPC_GAHZRILLA) { diff --git a/src/scripts/kalimdor/zulfarrak/zulfarrak.cpp b/src/scripts/kalimdor/zulfarrak/zulfarrak.cpp index 94fd13fe266..2ca053c23b6 100644 --- a/src/scripts/kalimdor/zulfarrak/zulfarrak.cpp +++ b/src/scripts/kalimdor/zulfarrak/zulfarrak.cpp @@ -63,13 +63,13 @@ struct npc_sergeant_blyAI : public ScriptedAI pInstance->SetData(0, NOT_STARTED);*/ } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { /*if (pInstance) pInstance->SetData(0, IN_PROGRESS);*/ } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { /*if (pInstance) pInstance->SetData(0, DONE);*/ @@ -115,7 +115,7 @@ bool GossipHello_npc_sergeant_bly(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_sergeant_bly(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_sergeant_bly(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -152,19 +152,19 @@ struct npc_weegli_blastfuseAI : public ScriptedAI pInstance->SetData(0, NOT_STARTED);*/ } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { /*if (pInstance) pInstance->SetData(0, IN_PROGRESS);*/ } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { /*if (pInstance) pInstance->SetData(0, DONE);*/ } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -192,7 +192,7 @@ bool GossipHello_npc_weegli_blastfuse(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_weegli_blastfuse(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_weegli_blastfuse(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -213,7 +213,7 @@ enum { DEAD_HERO_CHANCE = 10 }; -bool GOHello_go_shallow_grave(Player* pPlayer, GameObject* pGo) +bool GOHello_go_shallow_grave(Player* /*pPlayer*/, GameObject* pGo) { // randomly summon a zombie or dead hero the first time a grave is used if (pGo->GetUseCount() == 0) @@ -237,7 +237,7 @@ enum { ZUMRAH_HOSTILE_FACTION = 37 }; -bool AreaTrigger_at_zumrah(Player* pPlayer, const AreaTriggerEntry *at) +bool AreaTrigger_at_zumrah(Player* pPlayer, const AreaTriggerEntry * /*at*/) { Creature* Zumrah = pPlayer->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp index c7219d791c0..51c4bce0c2d 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp @@ -79,7 +79,7 @@ struct boss_amanitarAI : public ScriptedAI } } - void JustDied(Unit *Killer) + void JustDied(Unit * /*Killer*/) { if (pInstance) { @@ -88,7 +88,7 @@ struct boss_amanitarAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS); @@ -180,8 +180,8 @@ struct mob_amanitar_mushroomsAI : public Scripted_NoMovementAI } } - void EnterCombat(Unit *who) {} - void AttackStart(Unit *victim) {} + void EnterCombat(Unit * /*who*/) {} + void AttackStart(Unit * /*victim*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp index 515b5d80678..2215d91c749 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp @@ -91,7 +91,7 @@ struct boss_elder_nadoxAI : public ScriptedAI pInstance->SetData(DATA_ELDER_NADOX_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_DEATH,me); @@ -99,12 +99,12 @@ struct boss_elder_nadoxAI : public ScriptedAI pInstance->SetData(DATA_ELDER_NADOX_EVENT, IN_PROGRESS); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_SLAY_3,me); //SAY_SLAY_3 on death? @@ -200,13 +200,13 @@ struct mob_ahnkahar_nerubianAI : public ScriptedAI uiSprintTimer = 10*IN_MILISECONDS; } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (me->GetEntry() == MOB_AHNKAHAR_GUARDIAN_ENTRY) DeadAhnkaharGuardian = true; } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} void UpdateAI(const uint32 diff) { @@ -246,10 +246,10 @@ struct mob_nadox_eggsAI : public Scripted_NoMovementAI c->UpdateAllStats(); } void Reset() {} - void EnterCombat(Unit* who) {} - void AttackStart(Unit* victim) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*victim*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) {} }; CreatureAI* GetAI_mob_ahnkahar_nerubian(Creature* pCreature) diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp index 5b222c9b116..d74b760fde7 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp @@ -87,7 +87,7 @@ struct boss_volazjAI : public ScriptedAI return 100*(me->GetHealth()-damage)/me->GetMaxHealth(); } - void DamageTaken(Unit *pAttacker, uint32 &damage) + void DamageTaken(Unit * /*pAttacker*/, uint32 &damage) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) damage = 0; @@ -161,7 +161,7 @@ struct boss_volazjAI : public ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -282,7 +282,7 @@ struct boss_volazjAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH_1, me); @@ -296,7 +296,7 @@ struct boss_volazjAI : public ScriptedAI Summons.DespawnAll(); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 2a80d9885de..eb8046f63cd 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -141,7 +141,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI DoScriptText(RAND(TEXT_SLAY_1, TEXT_SLAY_2, TEXT_SLAY_3), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(TEXT_DEATH, me); if (pInstance) @@ -508,11 +508,11 @@ struct npc_jedogas_aufseher_triggerAI : public Scripted_NoMovementAI bool bCasted2; void Reset() {} - void EnterCombat(Unit* who) {} - void AttackStart(Unit* victim) {} - void MoveInLineOfSight(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*victim*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!pInstance) return; diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index 5d28a7efbbb..93a66ccfbca 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -110,7 +110,7 @@ struct boss_taldaramAI : public ScriptedAI pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, IN_PROGRESS); @@ -237,7 +237,7 @@ struct boss_taldaramAI : public ScriptedAI } else uiPhaseTimer -= diff; } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { Unit* pEmbraceTarget = GetEmbraceTarget(); @@ -254,7 +254,7 @@ struct boss_taldaramAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -262,7 +262,7 @@ struct boss_taldaramAI : public ScriptedAI pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; @@ -342,10 +342,10 @@ struct mob_taldaram_flamesphereAI : public ScriptedAI uiDespawnTimer = 10*IN_MILISECONDS; } - void EnterCombat(Unit *who) {} - void MoveInLineOfSight(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} + void MoveInLineOfSight(Unit * /*who*/) {} - void JustDied(Unit* slayer) + void JustDied(Unit* /*who*/) { DoCast(me, SPELL_FLAME_SPHERE_DEATH_EFFECT); } @@ -369,7 +369,7 @@ CreatureAI* GetAI_mob_taldaram_flamesphere(Creature* pCreature) return new mob_taldaram_flamesphereAI (pCreature); } -bool GOHello_prince_taldaram_sphere(Player *pPlayer, GameObject *pGO) +bool GOHello_prince_taldaram_sphere(Player * /*pPlayer*/, GameObject *pGO) { ScriptedInstance *pInstance = pGO->GetInstanceData(); diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp index fa2f2bc1f0f..4e6e3ec8c9f 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp @@ -90,7 +90,7 @@ struct instance_ahnkahet : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -103,7 +103,7 @@ struct instance_ahnkahet : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp index d1563b14873..340ae254b0f 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp @@ -109,7 +109,7 @@ struct boss_anub_arakAI : public ScriptedAI } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -246,7 +246,7 @@ struct boss_anub_arakAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit *pKiller) + void JustDied(Unit * /*pKiller*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp index c5c4f64c926..0fc4e87d7c5 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp @@ -100,13 +100,13 @@ struct boss_hadronoxAI : public ScriptedAI me->SetHealth(me->GetHealth()+health); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(DATA_HADRONOX_EVENT, DONE); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_HADRONOX_EVENT, IN_PROGRESS); 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 dc7608d76ec..fa035693008 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 @@ -114,7 +114,7 @@ struct boss_krik_thirAI : public ScriptedAI pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); Summon(); @@ -178,7 +178,7 @@ struct boss_krik_thirAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -194,7 +194,7 @@ struct boss_krik_thirAI : public ScriptedAI pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE); } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; @@ -212,7 +212,7 @@ struct npc_skittering_infectorAI : public ScriptedAI { npc_skittering_infectorAI(Creature *c) : ScriptedAI(c) {} - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { //The spell is not working propperly DoCast(me->getVictim(),SPELL_ACID_SPLASH, true); @@ -344,7 +344,7 @@ struct npc_watcher_gashraAI : public ScriptedAI uiInfectedBiteTimer = 4*IN_MILISECONDS; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoCast(me, SPELL_ENRAGE, true); } diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp index bf322e8b392..4d7f1fa2172 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp @@ -63,7 +63,7 @@ struct instance_azjol_nerub : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -76,7 +76,7 @@ struct instance_azjol_nerub : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch (pGo->GetEntry()) { diff --git a/src/scripts/northrend/borean_tundra.cpp b/src/scripts/northrend/borean_tundra.cpp index 1936b20507b..b36463b581f 100644 --- a/src/scripts/northrend/borean_tundra.cpp +++ b/src/scripts/northrend/borean_tundra.cpp @@ -76,7 +76,7 @@ bool GossipHello_npc_fizzcrank_fullthrottle(Player* pPlayer, Creature* pCreature return true; } -bool GossipSelect_npc_fizzcrank_fullthrottle(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_fizzcrank_fullthrottle(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -147,7 +147,7 @@ bool GossipHello_npc_surristrasz(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_OPTION_GOSSIP) { @@ -181,7 +181,7 @@ bool GossipHello_npc_tiare(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_tiare(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_tiare(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_OPTION_GOSSIP) { @@ -231,7 +231,7 @@ struct npc_sinkhole_kill_creditAI : public ScriptedAI } } - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { @@ -361,7 +361,7 @@ bool GossipHello_npc_keristrasza(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_keristrasza(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_keristrasza(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { @@ -399,7 +399,7 @@ bool GossipHello_npc_corastrasza(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_corastrasza(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_corastrasza(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -436,7 +436,7 @@ bool GossipHello_npc_iruk(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_iruk(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_iruk(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -463,8 +463,8 @@ struct mob_nerubar_victimAI : public ScriptedAI mob_nerubar_victimAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit *who) {} - void MoveInLineOfSight(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} + void MoveInLineOfSight(Unit * /*who*/) {} void JustDied(Unit* Killer) { @@ -556,12 +556,12 @@ struct npc_jennyAI : public ScriptedAI } } - void DamageTaken(Unit* pDone_by, uint32& uiDamage) + void DamageTaken(Unit* /*pDone_by*/, uint32& /*uiDamage*/) { DoCast(me, SPELL_DROP_CRATE, true); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (setCrateNumber) { @@ -664,10 +664,10 @@ struct npc_nesingwary_trapperAI : public ScriptedAI Phase = 1; go_caribouGUID = 0; } - void EnterCombat(Unit *who) {} - void MoveInLineOfSight(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} + void MoveInLineOfSight(Unit * /*who*/) {} - void JustDied(Unit *who) + void JustDied(Unit * /*who*/) { if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetLootState(GO_JUST_DEACTIVATED); @@ -972,7 +972,7 @@ struct npc_nexus_drake_hatchlingAI : public FollowerAI //The spell who makes the } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (WithRedDragonBlood && HarpoonerGUID && !me->HasAura(SPELL_RED_DRAGONBLOOD)) { @@ -1294,7 +1294,7 @@ struct npc_thassarianAI : public npc_escortAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (Creature* pTalbot = me->GetCreature(*me, uiTalbot)) pTalbot->RemoveFromWorld(); @@ -1323,7 +1323,7 @@ bool GossipHello_npc_thassarian(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_thassarian(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_thassarian(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -1353,7 +1353,7 @@ struct npc_image_lich_kingAI : public ScriptedAI me->RestoreFaction(); } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -1377,7 +1377,7 @@ struct npc_general_arlosAI : public ScriptedAI { npc_general_arlosAI(Creature* pCreature) : ScriptedAI(pCreature) {} - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -1430,7 +1430,7 @@ struct npc_counselor_talbotAI : public ScriptedAI uiDeflectionTimer = urand(20000,25000); uiSoulBlastTimer = urand (12000,18000); } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -1527,7 +1527,7 @@ struct npc_leryssaAI : public ScriptedAI uint32 Phase; uint32 uiPhaseTimer; - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -1683,7 +1683,7 @@ struct npc_beryl_sorcererAI : public FollowerAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 /*uiDiff*/) { if (!UpdateVictim()) return; @@ -1732,9 +1732,8 @@ struct npc_imprisoned_beryl_sorcererAI : public ScriptedAI CasterGUID = NULL; } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { - return; } void SpellHit(Unit* pUnit, const SpellEntry* pSpell) @@ -1870,7 +1869,7 @@ struct npc_mootoo_the_youngerAI : public npc_escortAI SetDespawnAtFar(false); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (Player* pPlayer=GetPlayerForEscort()) pPlayer->FailQuest(QUEST_ESCAPING_THE_MIST); @@ -1957,13 +1956,13 @@ struct npc_bonker_togglevoltAI : public npc_escortAI SetDespawnAtFar(false); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (Player* pPlayer = GetPlayerForEscort()) pPlayer->FailQuest(QUEST_ESCAPING_THE_MIST); } - void UpdateEscortAI(const uint32 diff) + void UpdateEscortAI(const uint32 /*diff*/) { if (GetAttack() && UpdateVictim()) { @@ -2090,7 +2089,7 @@ struct npc_trapped_mammoth_calfAI : public ScriptedAI bStarted = true; } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { GameObject* pTrap; if (uiType != POINT_MOTION_TYPE) @@ -2280,9 +2279,9 @@ struct npc_warmage_coldarraAI : public Scripted_NoMovementAI m_uiTimer = 0; } - void Aggro(Unit* pWho){} + void Aggro(Unit* /*pWho*/) {} - void AttackStart(Unit* pWho){} + void AttackStart(Unit* /*pWho*/) {} void UpdateAI(const uint32 uiDiff) { diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp index d8b68a41471..c33ea69fa2d 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp @@ -85,7 +85,7 @@ struct boss_eadricAI : public ScriptedAI bDone = false; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) { @@ -96,7 +96,7 @@ struct boss_eadricAI : public ScriptedAI } } - void MovementInform(uint32 MovementType, uint32 Data) + void MovementInform(uint32 MovementType, uint32 /*Data*/) { if (MovementType != POINT_MOTION_TYPE) return; @@ -199,13 +199,13 @@ struct boss_paletressAI : public ScriptedAI pMemory->RemoveFromWorld(); } - void SetData(uint32 uiId, uint32 uiValue) + void SetData(uint32 uiId, uint32 /*uiValue*/) { if (uiId == 1) me->RemoveAura(SPELL_SHIELD); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) { @@ -358,7 +358,7 @@ struct npc_memoryAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (me->isSummon()) { @@ -412,7 +412,7 @@ struct npc_argent_soldierAI : public npc_escortAI } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 /*uiData*/) { switch(me->GetEntry()) { @@ -474,7 +474,7 @@ struct npc_argent_soldierAI : public npc_escortAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED,pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp index 2a92412daac..e1f4586ca6c 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp @@ -257,7 +257,7 @@ struct boss_black_knightAI : public ScriptedAI DoMeleeAttackIfReady(); } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) { if (uiDamage > me->GetHealth() && uiPhase <= PHASE_SKELETON) { @@ -278,7 +278,7 @@ struct boss_black_knightAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) pInstance->SetData(BOSS_BLACK_KNIGHT,DONE); @@ -332,7 +332,7 @@ struct npc_black_knight_skeletal_gryphonAI : public npc_escortAI Start(false,true,0,NULL); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 /*i*/) { } diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp index e1812f4b608..4bf8143a210 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp @@ -166,7 +166,7 @@ struct generic_vehicleAI_toc5AI : public npc_escortAI uiBuffTimer = urand(30000,60000); } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 /*uiData*/) { switch(uiType) { @@ -210,7 +210,7 @@ struct generic_vehicleAI_toc5AI : public npc_escortAI } } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoCastSpellShield(); } @@ -406,7 +406,7 @@ struct boss_warrior_toc5AI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); @@ -540,7 +540,7 @@ struct boss_mage_toc5AI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); @@ -681,7 +681,7 @@ struct boss_shaman_toc5AI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); @@ -830,7 +830,7 @@ struct boss_hunter_toc5AI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); @@ -945,7 +945,7 @@ struct boss_rouge_toc5AI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp index 78893ee5eb8..04b671ec11c 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp @@ -90,7 +90,7 @@ struct instance_trial_of_the_champion : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool bAdd) + void OnCreatureCreate(Creature* pCreature, bool /*bAdd*/) { Map::PlayerList const &players = instance->GetPlayers(); uint32 TeamInInstance = 0; @@ -141,7 +141,7 @@ struct instance_trial_of_the_champion : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGO, bool bAdd) + void OnGameObjectCreate(GameObject* pGO, bool /*bAdd*/) { switch(pGO->GetEntry()) { diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp index a246a16b0f2..090b64b96cc 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp @@ -111,7 +111,7 @@ struct npc_announcer_toc5AI : public ScriptedAI uiPhase = uiPhaseStep; } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 /*uiData*/) { switch (uiType) { @@ -488,7 +488,7 @@ bool GossipHello_npc_announcer_toc5(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_announcer_toc5(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_announcer_toc5(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/scripts/northrend/crystalsong_forest.cpp b/src/scripts/northrend/crystalsong_forest.cpp index 389fa2da610..22e2ae1e091 100644 --- a/src/scripts/northrend/crystalsong_forest.cpp +++ b/src/scripts/northrend/crystalsong_forest.cpp @@ -54,7 +54,7 @@ struct npc_warmage_violetstandAI : public Scripted_NoMovementAI uiTargetGUID = 0; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 /*uiDiff*/) { if (me->IsNonMeleeSpellCasted(false)) return; diff --git a/src/scripts/northrend/dalaran.cpp b/src/scripts/northrend/dalaran.cpp index 03df79c69fe..7d5e76ffe35 100644 --- a/src/scripts/northrend/dalaran.cpp +++ b/src/scripts/northrend/dalaran.cpp @@ -53,9 +53,9 @@ struct npc_mageguard_dalaranAI : public Scripted_NoMovementAI void Reset(){} - void Aggro(Unit* pWho){} + void Aggro(Unit* /*pWho*/){} - void AttackStart(Unit* pWho){} + void AttackStart(Unit* /*pWho*/){} void MoveInLineOfSight(Unit *pWho) { @@ -97,7 +97,7 @@ struct npc_mageguard_dalaranAI : public Scripted_NoMovementAI return; } - void UpdateAI(const uint32 diff){} + void UpdateAI(const uint32 /*diff*/){} }; CreatureAI* GetAI_npc_mageguard_dalaran(Creature* pCreature) @@ -131,7 +131,7 @@ bool GossipHello_npc_hira_snowdawn(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_hira_snowdawn(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_hira_snowdawn(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRAIN) pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); diff --git a/src/scripts/northrend/dragonblight.cpp b/src/scripts/northrend/dragonblight.cpp index 62d4c6e3763..0b85abc25aa 100644 --- a/src/scripts/northrend/dragonblight.cpp +++ b/src/scripts/northrend/dragonblight.cpp @@ -48,7 +48,7 @@ bool GossipHello_npc_alexstrasza_wr_gate(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_alexstrasza_wr_gate(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_alexstrasza_wr_gate(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/scripts/northrend/draktharon_keep/boss_dred.cpp b/src/scripts/northrend/draktharon_keep/boss_dred.cpp index 193c1ff0fe2..ba64a4748dd 100644 --- a/src/scripts/northrend/draktharon_keep/boss_dred.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_dred.cpp @@ -79,7 +79,7 @@ struct boss_dredAI : public ScriptedAI uiRaptorCallTimer = urand(20*IN_MILISECONDS,25*IN_MILISECONDS); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_DRED_EVENT,IN_PROGRESS); @@ -136,7 +136,7 @@ struct boss_dredAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -184,7 +184,7 @@ struct npc_drakkari_gutripperAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -232,7 +232,7 @@ struct npc_drakkari_scytheclawAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { diff --git a/src/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/scripts/northrend/draktharon_keep/boss_novos.cpp index 64ac3f01c79..5e8792c352d 100644 --- a/src/scripts/northrend/draktharon_keep/boss_novos.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_novos.cpp @@ -114,7 +114,7 @@ struct boss_novosAI : public Scripted_NoMovementAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); Phase = PHASE_1; @@ -167,7 +167,7 @@ struct boss_novosAI : public Scripted_NoMovementAI break; } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); if (pInstance) @@ -180,7 +180,7 @@ struct boss_novosAI : public Scripted_NoMovementAI lSummons.DespawnAll(); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; @@ -240,7 +240,7 @@ struct mob_crystal_handlerAI : public ScriptedAI uiFlashOfDarknessTimer = 5*IN_MILISECONDS; } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) CAST_AI(boss_novosAI,pNovos->AI())->RemoveCrystal(); diff --git a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index f1ab16467a5..a459201d600 100644 --- a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -96,7 +96,7 @@ struct boss_tharon_jaAI : public ScriptedAI pInstance->SetData(DATA_THARON_JA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -218,12 +218,12 @@ struct boss_tharon_jaAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2),me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH,me); diff --git a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp index 7b2bfb9756d..03eac73385d 100644 --- a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp @@ -94,7 +94,7 @@ struct boss_trollgoreAI : public ScriptedAI pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -152,7 +152,7 @@ struct boss_trollgoreAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -166,7 +166,7 @@ struct boss_trollgoreAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp b/src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp index 8a5f663908e..9f4d2ee52a2 100644 --- a/src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp +++ b/src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp @@ -84,7 +84,7 @@ struct instance_drak_tharon : public ScriptedInstance return false; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -103,7 +103,7 @@ struct instance_drak_tharon : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp b/src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp index 64b01ade2b5..8133a0dfea7 100644 --- a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp +++ b/src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp @@ -90,7 +90,7 @@ struct boss_bronjahmAI : public ScriptedAI pInstance->SetData(DATA_BRONJAHM_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -98,7 +98,7 @@ struct boss_bronjahmAI : public ScriptedAI pInstance->SetData(DATA_BRONJAHM_EVENT, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -106,7 +106,7 @@ struct boss_bronjahmAI : public ScriptedAI pInstance->SetData(DATA_BRONJAHM_EVENT, DONE); } - void KilledUnit(Unit *pWho) + void KilledUnit(Unit * /*who*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } @@ -215,14 +215,14 @@ struct mob_corrupted_soul_fragmentAI : public ScriptedAI } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 /*type*/, uint32 /*id*/) { if (pInstance) if (Creature* pBronjham = Unit::GetCreature(*me,pInstance->GetData64(DATA_BRONJAHM))) DoCast(pBronjham,SPELL_CONSUME_SOUL); } - void UpdateAI(const uint32 diff) {} + void UpdateAI(const uint32 /*diff*/) {} }; CreatureAI* GetAI_mob_corrupted_soul_fragment(Creature* pCreature) diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp b/src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp index 398c83df58a..94f29fecb23 100644 --- a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp +++ b/src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp @@ -152,7 +152,7 @@ struct boss_devourer_of_soulsAI : public ScriptedAI pInstance->SetData(DATA_DEVOURER_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_DEVOURER_EVENT, IN_PROGRESS); @@ -166,7 +166,7 @@ struct boss_devourer_of_soulsAI : public ScriptedAI events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000,70000)); } - void DamageTaken(Unit *pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) { if (uiMirroredSoulTarget && me->HasAura(SPELL_MIRRORED_SOUL)) { @@ -184,13 +184,13 @@ struct boss_devourer_of_soulsAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_FACE_ANGER_SLAY_1,SAY_FACE_SORROW_SLAY_1,SAY_FACE_DESIRE_SLAY_1, SAY_FACE_ANGER_SLAY_2,SAY_FACE_SORROW_SLAY_2,SAY_FACE_DESIRE_SLAY_2), me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { Position spawnPoint = { 5618.139, 2451.873, 705.854 }; @@ -224,7 +224,7 @@ struct boss_devourer_of_soulsAI : public ScriptedAI } } - void SpellHitTarget(Unit* pTarget, const SpellEntry *pSpell) + void SpellHitTarget(Unit* /*pTarget*/, const SpellEntry *pSpell) { if (pSpell->Id == H_SPELL_PHANTOM_BLAST) bThreeFaceAchievement = false; diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp b/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp index 468f98e0749..66ca42e1ed5 100644 --- a/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp +++ b/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp @@ -362,7 +362,7 @@ bool GossipHello_npc_jaina_or_slyvanas_fos(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_jaina_or_slyvanas_fos(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_jaina_or_slyvanas_fos(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -390,7 +390,7 @@ struct mob_spiteful_apparitionAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_SPITE, 8000); } @@ -434,7 +434,7 @@ struct mob_spectral_wardenAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_VEIL_OF_SHADOWS, 5000); events.ScheduleEvent(EVENT_WAIL_OF_SOULS, 10000); @@ -483,7 +483,7 @@ struct mob_soulguard_watchmanAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_SHROUD_OF_RUNES, 1000); events.ScheduleEvent(EVENT_UNHOLY_RAGE, 1000); @@ -531,7 +531,7 @@ struct mob_soulguard_reaperAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_FROST_NOVA, 8000); events.ScheduleEvent(EVENT_SHADOW_LANCE, 5000); @@ -581,7 +581,7 @@ struct mob_soulguard_bonecasterAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_BONE_VOLLEY, 6000); events.ScheduleEvent(EVENT_RAISE_DEAD, 25000); @@ -635,7 +635,7 @@ struct mob_soulguard_animatorAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_RAISE_DEAD, 25000); events.ScheduleEvent(EVENT_SHADOW_BOLT, 5000); @@ -697,7 +697,7 @@ struct mob_soulguard_adeptAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_RAISE_DEAD, 25000); events.ScheduleEvent(EVENT_SHADOW_BOLT, 8000); @@ -758,7 +758,7 @@ struct mob_soul_horrorAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_SOUL_STRIKE, 6000); } diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp b/src/scripts/northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp index 908f2857b89..67a6cdb4579 100644 --- a/src/scripts/northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp +++ b/src/scripts/northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp @@ -53,7 +53,7 @@ struct instance_forge_of_souls : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { Map::PlayerList const &players = instance->GetPlayers(); diff --git a/src/scripts/northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp b/src/scripts/northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp index 50565d7e142..3c0c1321a77 100644 --- a/src/scripts/northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp +++ b/src/scripts/northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp @@ -45,7 +45,7 @@ struct instance_halls_of_reflection : public ScriptedInstance m_auiEncounter[i] = NOT_STARTED; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp index fb0359ffdf5..25c78c4a0d3 100644 --- a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp +++ b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp @@ -87,7 +87,7 @@ struct boss_garfrostAI : public ScriptedAI pInstance->SetData(DATA_GARFROST_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_PERMAFROST); @@ -98,7 +98,7 @@ struct boss_garfrostAI : public ScriptedAI events.ScheduleEvent(EVENT_THROW_SARONITE, 45000); } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32& /*uiDamage*/) { if (HealthBelowPct(66) && !phase2) { @@ -126,7 +126,7 @@ struct boss_garfrostAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; @@ -134,7 +134,7 @@ struct boss_garfrostAI : public ScriptedAI DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); if (pInstance) diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp index 593cec5f04f..8b8b03a3d4e 100644 --- a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp +++ b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp @@ -142,7 +142,7 @@ struct boss_ickAI : public ScriptedAI return me->GetCreature(*me, pInstance ? pInstance->GetData64(DATA_KRICK) : 0); } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_KRICKANDICK_EVENT, IN_PROGRESS); @@ -168,7 +168,7 @@ struct boss_ickAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (Creature* pKrick = GetKrick()) { @@ -291,7 +291,7 @@ struct boss_krickAI : public ScriptedAI return me->GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ICK) : 0); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; @@ -299,7 +299,7 @@ struct boss_krickAI : public ScriptedAI DoScriptText(RAND(SAY_KRICK_SLAY_1,SAY_KRICK_SLAY_2), me); } - void DamageTaken(Unit *pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) { // if killed whatever the reason, it breaks the outro uiDamage = 0; diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp index 0f6753a0f53..55ffa0b4e4b 100644 --- a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp +++ b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp @@ -107,7 +107,7 @@ struct boss_tyrannusAI : public ScriptedAI return me->GetCreature(*me, pInstance->GetData64(DATA_RIMEFANG)); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); me->ExitVehicle(); @@ -123,12 +123,12 @@ struct boss_tyrannusAI : public ScriptedAI events.ScheduleEvent(EVENT_DARK_MIGHT, 40000); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -196,7 +196,7 @@ struct boss_rimefangAI : public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { me->InterruptSpell(CURRENT_GENERIC_SPELL); me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp b/src/scripts/northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp index 45422f54bcd..8512eca24c1 100644 --- a/src/scripts/northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp +++ b/src/scripts/northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp @@ -61,7 +61,7 @@ struct instance_pit_of_saron : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { Map::PlayerList const &players = instance->GetPlayers(); diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp b/src/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp index 82eebb5d3dd..bc53efc7033 100644 --- a/src/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp +++ b/src/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp @@ -161,7 +161,7 @@ struct mob_ymirjar_wrathbringerAI : public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_BLIGHT, 7000); } @@ -206,7 +206,7 @@ struct mob_ymirjar_skyCallerAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_FROSTBLADE, 1); events.ScheduleEvent(EVENT_GLACIAL_STRIKE, 8000); @@ -255,7 +255,7 @@ struct mob_ymirjar_flamebearerAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_FIREBALL, 4000); events.ScheduleEvent(EVENT_HELLFIRE, 8000); @@ -312,7 +312,7 @@ struct mob_ymirjar_deathbringerAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_EMPOWERED_SHADOW_BOLT, 8000); } @@ -357,7 +357,7 @@ struct mob_wrathbone_laborerAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_BLINDING_DIRT, 8000); events.ScheduleEvent(EVENT_PUNCTURE_WOUND, 9000); @@ -413,7 +413,7 @@ struct mob_wrathbone_coldwraithAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_FREEZING_CIRCLE, 9000); events.ScheduleEvent(EVENT_FROSTBOLT, 5000); @@ -464,7 +464,7 @@ struct mob_stonespine_gargoyleAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_GARGOYLE_STRIKE, 5000); } @@ -513,7 +513,7 @@ struct mob_plagueborn_horrorAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_BLIGHT_BOMB, 999999); events.ScheduleEvent(EVENT_PUSTULANT_FLESH, 5000); @@ -568,7 +568,7 @@ struct mob_iceborn_protodrakeAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_FROST_BREATH, 5000); } @@ -612,7 +612,7 @@ struct mob_hungering_ghoulAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_DEVOUR_FLESH, 4000); } @@ -656,7 +656,7 @@ struct mob_fallen_warriorAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_ARCING_SLICE, 8000); events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 20000); @@ -710,7 +710,7 @@ struct mob_deathwhisper_torturerAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_BLACK_BRAND, 10000); events.ScheduleEvent(EVENT_CURSE_OF_AGONY, 6000); @@ -761,7 +761,7 @@ struct mob_deathwhisper_shadowcasterAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_SHADOW_BOLT, 3000); } @@ -806,7 +806,7 @@ struct mob_deathwhisper_necrolyteAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_CONVERSION_BEAM, 12000); events.ScheduleEvent(EVENT_SHADOW_BOLT_2, 4000); @@ -857,7 +857,7 @@ struct mob_wrathbone_sorcererAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_SHADOW_BOLT_3, 3000); } @@ -902,7 +902,7 @@ struct mob_geist_ambusherAI: public ScriptedAI events.Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { //Only here so when I figure out how to make it cast on an NPC i can do that. events.ScheduleEvent(EVENT_LEAPING_FACE_MAUL, 99999); diff --git a/src/scripts/northrend/grizzly_hills.cpp b/src/scripts/northrend/grizzly_hills.cpp index c07de861c9e..0fb7372f250 100644 --- a/src/scripts/northrend/grizzly_hills.cpp +++ b/src/scripts/northrend/grizzly_hills.cpp @@ -86,7 +86,7 @@ bool GossipHello_npc_orsonn_and_kodian(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_orsonn_and_kodian(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_orsonn_and_kodian(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -267,7 +267,7 @@ struct npc_emilyAI : public npc_escortAI } } - void EnterCombat(Unit* Who) + void EnterCombat(Unit* /*Who*/) { DoScriptText(SAY_RANDOMAGGRO, me); } @@ -348,9 +348,9 @@ struct npc_mrfloppyAI : public ScriptedAI void EnterEvadeMode() {} - void MoveInLineOfSight(Unit *who) {} + void MoveInLineOfSight(Unit * /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -437,7 +437,7 @@ struct npc_tallhorn_stagAI : public ScriptedAI m_uiPhase = 1; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 /*uiDiff*/) { if (m_uiPhase = 1) { diff --git a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp index d5c7eed469d..04603c68813 100644 --- a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp +++ b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp @@ -64,7 +64,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI bHealth1 = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, IN_PROGRESS); @@ -122,7 +122,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, DONE); @@ -162,7 +162,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI me->RemoveFromWorld(); } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -202,7 +202,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (Creature *pColossus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0)) pColossus->Kill(pColossus); @@ -227,7 +227,7 @@ struct npc_living_mojoAI : public ScriptedAI uiMojoPuddleTimer = 7*IN_MILISECONDS; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { //Check if the npc is near of Drakkari Colossus. @@ -240,7 +240,7 @@ struct npc_living_mojoAI : public ScriptedAI } } - void DamageTaken(Unit* pDone_by, uint32& uiDamage) + void DamageTaken(Unit* pDone_by, uint32& /*uiDamage*/) { if (me->HasReactState(REACT_PASSIVE)) { diff --git a/src/scripts/northrend/gundrak/boss_eck.cpp b/src/scripts/northrend/gundrak/boss_eck.cpp index cd329119ca8..3bf1a33da5a 100644 --- a/src/scripts/northrend/gundrak/boss_eck.cpp +++ b/src/scripts/northrend/gundrak/boss_eck.cpp @@ -59,7 +59,7 @@ struct boss_eckAI : public ScriptedAI pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, IN_PROGRESS); @@ -115,7 +115,7 @@ struct boss_eckAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, DONE); @@ -136,7 +136,7 @@ struct npc_ruins_dwellerAI : public ScriptedAI ScriptedInstance* pInstance; - void JustDied(Unit *who) + void JustDied(Unit * /*who*/) { if (pInstance) { diff --git a/src/scripts/northrend/gundrak/boss_gal_darah.cpp b/src/scripts/northrend/gundrak/boss_gal_darah.cpp index a5e4bb02cf3..c87a6600783 100644 --- a/src/scripts/northrend/gundrak/boss_gal_darah.cpp +++ b/src/scripts/northrend/gundrak/boss_gal_darah.cpp @@ -116,7 +116,7 @@ struct boss_gal_darahAI : public ScriptedAI pInstance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -238,7 +238,7 @@ struct boss_gal_darahAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -263,7 +263,7 @@ struct boss_gal_darahAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/northrend/gundrak/boss_moorabi.cpp b/src/scripts/northrend/gundrak/boss_moorabi.cpp index bd832061dab..84a7d8bc654 100644 --- a/src/scripts/northrend/gundrak/boss_moorabi.cpp +++ b/src/scripts/northrend/gundrak/boss_moorabi.cpp @@ -77,7 +77,7 @@ struct boss_moorabiAI : public ScriptedAI pInstance->SetData(DATA_MOORABI_EVENT, NOT_STARTED); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_MOJO_FRENZY, true); @@ -137,7 +137,7 @@ struct boss_moorabiAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/northrend/gundrak/boss_slad_ran.cpp b/src/scripts/northrend/gundrak/boss_slad_ran.cpp index ccc28654d2c..1014beaeddd 100644 --- a/src/scripts/northrend/gundrak/boss_slad_ran.cpp +++ b/src/scripts/northrend/gundrak/boss_slad_ran.cpp @@ -98,7 +98,7 @@ struct boss_slad_ranAI : public ScriptedAI pInstance->SetData(DATA_SLAD_RAN_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -159,7 +159,7 @@ struct boss_slad_ranAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -167,7 +167,7 @@ struct boss_slad_ranAI : public ScriptedAI pInstance->SetData(DATA_SLAD_RAN_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } diff --git a/src/scripts/northrend/gundrak/instance_gundrak.cpp b/src/scripts/northrend/gundrak/instance_gundrak.cpp index c04901bd27b..4dd896f74f2 100644 --- a/src/scripts/northrend/gundrak/instance_gundrak.cpp +++ b/src/scripts/northrend/gundrak/instance_gundrak.cpp @@ -128,7 +128,7 @@ struct instance_gundrak : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -144,7 +144,7 @@ struct instance_gundrak : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -490,10 +490,10 @@ struct instance_gundrak : public ScriptedInstance } }; -bool GOHello_altar(Player *pPlayer, GameObject *pGO) +bool GOHello_altar(Player * /*pPlayer*/, GameObject *pGO) { ScriptedInstance *pInstance = pGO->GetInstanceData(); - uint64 uiStatue; + uint64 uiStatue = 0; pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); pGO->SetGoState(GO_STATE_ACTIVE); diff --git a/src/scripts/northrend/howling_fjord.cpp b/src/scripts/northrend/howling_fjord.cpp index 6940fc310c6..172501e2faa 100644 --- a/src/scripts/northrend/howling_fjord.cpp +++ b/src/scripts/northrend/howling_fjord.cpp @@ -72,7 +72,7 @@ struct npc_Apothecary_HanesAI : public npc_escortAI PotTimer = 10000; //10 sec cooldown on potion } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (Player* pPlayer = GetPlayerForEscort()) pPlayer->FailQuest(QUEST_TRAIL_OF_FIRE); @@ -250,7 +250,7 @@ bool GossipHello_npc_razael_and_lyana(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_razael_and_lyana(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_razael_and_lyana(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -292,7 +292,7 @@ bool GossipHello_npc_mcgoyver(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_mcgoyver(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_mcgoyver(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { diff --git a/src/scripts/northrend/icecrown.cpp b/src/scripts/northrend/icecrown.cpp index 7d1f768a2df..5c47f22f825 100644 --- a/src/scripts/northrend/icecrown.cpp +++ b/src/scripts/northrend/icecrown.cpp @@ -68,7 +68,7 @@ bool GossipHello_npc_arete(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_arete(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_arete(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -123,7 +123,7 @@ bool GossipHello_npc_dame_evniki_kapsalis(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_dame_evniki_kapsalis(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_dame_evniki_kapsalis(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -160,7 +160,7 @@ bool GossipHello_npc_squire_david(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_squire_david(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_squire_david(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -201,7 +201,7 @@ struct npc_argent_valiantAI : public ScriptedAI uiShieldBreakerTimer = 10000; } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -263,7 +263,7 @@ struct npc_argent_tournament_postAI : public ScriptedAI { npc_argent_tournament_postAI(Creature* pCreature) : ScriptedAI(pCreature) {} - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 /*uiDiff*/) { if (me->IsNonMeleeSpellCasted(false)) return; @@ -308,7 +308,7 @@ struct npc_alorah_and_grimminAI : public ScriptedAI uiCast = 1; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 /*uiDiff*/) { if (uiCast = 1) { diff --git a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp index b3bcebd6bc1..0439e73cc95 100644 --- a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp +++ b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp @@ -83,7 +83,7 @@ struct boss_anubrekhanAI : public BossAI DoScriptText(SAY_SLAY, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); diff --git a/src/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/scripts/northrend/naxxramas/boss_faerlina.cpp index bd88c254c58..aa5a940eb8f 100644 --- a/src/scripts/northrend/naxxramas/boss_faerlina.cpp +++ b/src/scripts/northrend/naxxramas/boss_faerlina.cpp @@ -66,7 +66,7 @@ struct boss_faerlinaAI : public BossAI bool doDelayFrenzy; bool bAchievement; - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4), me); @@ -92,13 +92,13 @@ struct boss_faerlinaAI : public BossAI BossAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (!(rand()%3)) DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { _JustDied(); DoScriptText(SAY_DEATH, me); @@ -186,7 +186,7 @@ struct mob_faerlina_addAI : public ScriptedAI } } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance && getDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL) { diff --git a/src/scripts/northrend/naxxramas/boss_four_horsemen.cpp b/src/scripts/northrend/naxxramas/boss_four_horsemen.cpp index 2f583d201b6..b88d45bf97a 100644 --- a/src/scripts/northrend/naxxramas/boss_four_horsemen.cpp +++ b/src/scripts/northrend/naxxramas/boss_four_horsemen.cpp @@ -262,7 +262,7 @@ struct boss_four_horsemenAI : public BossAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) { @@ -273,7 +273,7 @@ struct boss_four_horsemenAI : public BossAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { events.Reset(); summons.DespawnAll(); @@ -294,7 +294,7 @@ struct boss_four_horsemenAI : public BossAI DoScriptText(SAY_DEATH[id], me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); diff --git a/src/scripts/northrend/naxxramas/boss_gluth.cpp b/src/scripts/northrend/naxxramas/boss_gluth.cpp index 8e2bf131131..a57b171db87 100644 --- a/src/scripts/northrend/naxxramas/boss_gluth.cpp +++ b/src/scripts/northrend/naxxramas/boss_gluth.cpp @@ -72,7 +72,7 @@ struct boss_gluthAI : public BossAI BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { for (uint32 i = 0; i < 3; ++i) if (Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummon[i])) diff --git a/src/scripts/northrend/naxxramas/boss_gothik.cpp b/src/scripts/northrend/naxxramas/boss_gothik.cpp index 62180e344f6..d958ff24951 100644 --- a/src/scripts/northrend/naxxramas/boss_gothik.cpp +++ b/src/scripts/northrend/naxxramas/boss_gothik.cpp @@ -171,7 +171,7 @@ struct boss_gothikAI : public BossAI thirtyPercentReached = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { for (uint32 i = 0; i < POS_LIVE; ++i) if (Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummonLive[i])) @@ -219,13 +219,13 @@ struct boss_gothikAI : public BossAI summons.Despawn(summon); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) DoScriptText(SAY_KILL, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { LiveTriggerGUID.clear(); DeadTriggerGUID.clear(); @@ -334,7 +334,7 @@ struct boss_gothikAI : public BossAI return false; } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { uint32 spellId = 0; switch(spell->Id) @@ -504,7 +504,7 @@ struct mob_gothik_minionAI : public CombatAI damage = 0; } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (me->isSummon()) { diff --git a/src/scripts/northrend/naxxramas/boss_grobbulus.cpp b/src/scripts/northrend/naxxramas/boss_grobbulus.cpp index f857adf1591..e1a1cbb7786 100644 --- a/src/scripts/northrend/naxxramas/boss_grobbulus.cpp +++ b/src/scripts/northrend/naxxramas/boss_grobbulus.cpp @@ -39,7 +39,7 @@ struct boss_grobbulusAI : public BossAI me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_POISON_CLOUD_ADD, true); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_CLOUD, 15000); diff --git a/src/scripts/northrend/naxxramas/boss_heigan.cpp b/src/scripts/northrend/naxxramas/boss_heigan.cpp index 89e5d5adb19..1de9c0e00c8 100644 --- a/src/scripts/northrend/naxxramas/boss_heigan.cpp +++ b/src/scripts/northrend/naxxramas/boss_heigan.cpp @@ -49,19 +49,19 @@ struct boss_heiganAI : public BossAI bool eruptDirection; Phases phase; - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* /*Victim*/) { if (!(rand()%5)) DoScriptText(SAY_SLAY, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { _JustDied(); DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); diff --git a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp index 18f78f63cee..bfcd0636298 100644 --- a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp +++ b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp @@ -321,7 +321,7 @@ struct boss_kelthuzadAI : public BossAI DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { _JustDied(); DoScriptText(SAY_DEATH, me); @@ -335,7 +335,7 @@ struct boss_kelthuzadAI : public BossAI chained.clear(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { me->setFaction(uiFaction); @@ -634,7 +634,7 @@ CreatureAI* GetAI_boss_kelthuzadAI(Creature* pCreature) return new boss_kelthuzadAI (pCreature); } -bool AreaTrigger_at_kelthuzad_center(Player* pPlayer, const AreaTriggerEntry *at) +bool AreaTrigger_at_kelthuzad_center(Player* pPlayer, const AreaTriggerEntry * /*at*/) { if (pPlayer->isGameMaster()) return false; diff --git a/src/scripts/northrend/naxxramas/boss_loatheb.cpp b/src/scripts/northrend/naxxramas/boss_loatheb.cpp index 40998e4bf77..0b0c8f5e4c5 100644 --- a/src/scripts/northrend/naxxramas/boss_loatheb.cpp +++ b/src/scripts/northrend/naxxramas/boss_loatheb.cpp @@ -41,7 +41,7 @@ struct boss_loathebAI : public BossAI { boss_loathebAI(Creature *c) : BossAI(c, BOSS_LOATHEB) {} - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_AURA, 10000); diff --git a/src/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/scripts/northrend/naxxramas/boss_maexxna.cpp index 810c6561c96..71d9cb86102 100644 --- a/src/scripts/northrend/naxxramas/boss_maexxna.cpp +++ b/src/scripts/northrend/naxxramas/boss_maexxna.cpp @@ -63,7 +63,7 @@ struct boss_maexxnaAI : public BossAI bool enraged; - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); enraged = false; @@ -142,7 +142,7 @@ struct mob_webwrapAI : public NullCreatureAI uint64 victimGUID; - void SetGUID(const uint64 &guid, int32 param) + void SetGUID(const uint64 &guid, int32 /*param*/) { victimGUID = guid; if (me->m_spells[0] && victimGUID) @@ -150,7 +150,7 @@ struct mob_webwrapAI : public NullCreatureAI victim->CastSpell(victim, me->m_spells[0], true, NULL, NULL, me->GetGUID()); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (me->m_spells[0] && victimGUID) if (Unit *victim = Unit::GetUnit(*me, victimGUID)) diff --git a/src/scripts/northrend/naxxramas/boss_noth.cpp b/src/scripts/northrend/naxxramas/boss_noth.cpp index d7400928aea..b0cd4018955 100644 --- a/src/scripts/northrend/naxxramas/boss_noth.cpp +++ b/src/scripts/northrend/naxxramas/boss_noth.cpp @@ -75,7 +75,7 @@ struct boss_nothAI : public BossAI _Reset(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); @@ -100,7 +100,7 @@ struct boss_nothAI : public BossAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) DoScriptText(SAY_SLAY, me); @@ -113,7 +113,7 @@ struct boss_nothAI : public BossAI summon->AI()->DoZoneInCombat(); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { _JustDied(); DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp index 060cc23bfc2..d5d0d720378 100644 --- a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp +++ b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp @@ -55,13 +55,13 @@ struct boss_patchwerkAI : public BossAI uint32 EncounterTime; - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* /*Victim*/) { if (!(rand()%5)) DoScriptText(SAY_SLAY, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { _JustDied(); DoScriptText(SAY_DEATH, me); @@ -82,7 +82,7 @@ struct boss_patchwerkAI : public BossAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); Enraged = false; diff --git a/src/scripts/northrend/naxxramas/boss_razuvious.cpp b/src/scripts/northrend/naxxramas/boss_razuvious.cpp index e7eb05c1ccc..d507df86e83 100644 --- a/src/scripts/northrend/naxxramas/boss_razuvious.cpp +++ b/src/scripts/northrend/naxxramas/boss_razuvious.cpp @@ -57,7 +57,7 @@ struct boss_razuviousAI : public BossAI { boss_razuviousAI(Creature *c) : BossAI(c, BOSS_RAZUVIOUS) {} - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (!(rand()%3)) DoPlaySoundToSet(me, SOUND_SLAY); @@ -72,14 +72,14 @@ struct boss_razuviousAI : public BossAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { _JustDied(); DoPlaySoundToSet(me, SOUND_DEATH); me->CastSpell(me, SPELL_HOPELESS, true); // TODO: this may affect other creatures } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); DoPlaySoundToSet(me, SOUND_AGGRO); diff --git a/src/scripts/northrend/naxxramas/boss_sapphiron.cpp b/src/scripts/northrend/naxxramas/boss_sapphiron.cpp index be5f3ac1d80..35172a39994 100644 --- a/src/scripts/northrend/naxxramas/boss_sapphiron.cpp +++ b/src/scripts/northrend/naxxramas/boss_sapphiron.cpp @@ -111,7 +111,7 @@ struct boss_sapphironAI : public BossAI CheckFrostResistTimer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); @@ -136,7 +136,7 @@ struct boss_sapphironAI : public BossAI } } - void JustDied(Unit* who) + void JustDied(Unit* /*who*/) { _JustDied(); me->CastSpell(me, SPELL_DIES, true); diff --git a/src/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/scripts/northrend/naxxramas/boss_thaddius.cpp index bd13aaba5fd..350cd450510 100644 --- a/src/scripts/northrend/naxxramas/boss_thaddius.cpp +++ b/src/scripts/northrend/naxxramas/boss_thaddius.cpp @@ -128,13 +128,13 @@ struct boss_thaddiusAI : public BossAI bool checkFeugenAlive; uint32 uiAddsTimer; - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) DoScriptText(SAY_SLAY, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { _JustDied(); DoScriptText(SAY_DEATH, me); @@ -171,7 +171,7 @@ struct boss_thaddiusAI : public BossAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); @@ -180,7 +180,7 @@ struct boss_thaddiusAI : public BossAI events.ScheduleEvent(EVENT_BERSERK, 360000); } - void DamageTaken(Unit *pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit * /*pDoneBy*/, uint32 & /*uiDamage*/) { me->SetReactState(REACT_AGGRESSIVE); } @@ -270,12 +270,12 @@ struct mob_stalaggAI : public ScriptedAI magneticPullTimer = 20000; } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit * /*pWho*/) { DoCast(SPELL_STALAGG_TESLA); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) @@ -347,12 +347,12 @@ struct mob_feugenAI : public ScriptedAI staticFieldTimer = 5000; } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit * /*pWho*/) { DoCast(SPELL_FEUGEN_TESLA); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) diff --git a/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp b/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp index 81b9b02701f..6b9f2d56b08 100644 --- a/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp +++ b/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp @@ -95,7 +95,7 @@ struct boss_malygosAI : public ScriptedAI //Source Deadly Boss Mod enrage = 615000; //10 min } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (phase == 1) DoScriptText(SAY_PHASE1_AGGRO, me); @@ -104,9 +104,9 @@ struct boss_malygosAI : public ScriptedAI if (phase == 3) DoScriptText(SAY_PHASE1_AGGRO, me); } - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) { phase =1; //Return since we have no target @@ -122,11 +122,11 @@ struct boss_malygosAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp index 5f936ac0374..02c39dc1232 100644 --- a/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp @@ -86,7 +86,7 @@ struct boss_anomalusAI : public ScriptedAI pInstance->SetData(DATA_ANOMALUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -94,7 +94,7 @@ struct boss_anomalusAI : public ScriptedAI pInstance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -195,7 +195,7 @@ struct mob_chaotic_riftAI : public Scripted_NoMovementAI DoCast(me, SPELL_ARCANEFORM, false); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0)) CAST_AI(boss_anomalusAI,pAnomalus->AI())->bDeadChaoticRift = true; diff --git a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp index 10ccc80035c..ff633c55eac 100644 --- a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp @@ -86,7 +86,7 @@ struct boss_keristraszaAI : public ScriptedAI pInstance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoCastAOE(SPELL_INTENSE_COLD); @@ -95,7 +95,7 @@ struct boss_keristraszaAI : public ScriptedAI pInstance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -107,7 +107,7 @@ struct boss_keristraszaAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_SLAY, me); } @@ -215,7 +215,7 @@ CreatureAI* GetAI_boss_keristrasza(Creature* pCreature) return new boss_keristraszaAI (pCreature); } -bool GOHello_containment_sphere(Player *pPlayer, GameObject *pGO) +bool GOHello_containment_sphere(Player * /*pPlayer*/, GameObject *pGO) { ScriptedInstance *pInstance = pGO->GetInstanceData(); diff --git a/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp b/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp index 7441087382d..0bf9fb07bb7 100644 --- a/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp @@ -109,7 +109,7 @@ struct boss_magus_telestraAI : public ScriptedAI pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -117,7 +117,7 @@ struct boss_magus_telestraAI : public ScriptedAI pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -129,7 +129,7 @@ struct boss_magus_telestraAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_KILL, me); } diff --git a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp index aabf8eaa71d..1304f95c7ac 100644 --- a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp @@ -86,7 +86,7 @@ struct boss_ormorokAI : public ScriptedAI pInstance->SetData(DATA_ORMOROK_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -94,7 +94,7 @@ struct boss_ormorokAI : public ScriptedAI pInstance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -102,7 +102,7 @@ struct boss_ormorokAI : public ScriptedAI pInstance->SetData(DATA_ORMOROK_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_KILL, me); } @@ -125,7 +125,7 @@ struct boss_ormorokAI : public ScriptedAI fSpikeXY[3][0] = fBaseX-(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO-(M_PI/2))); fSpikeXY[3][1] = fBaseY-(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO-(M_PI/2))); for (uint8 i = 0; i < 4; ++i) - Creature* Spike = me->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILISECONDS); + me->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILISECONDS); if (++uiCrystalSpikesCount >= 13) bCrystalSpikes = false; uiCrystalSpikesTimer2 = 200; diff --git a/src/scripts/northrend/nexus/nexus/commander_kolurg.cpp b/src/scripts/northrend/nexus/nexus/commander_kolurg.cpp index 5ab6a737615..4bd9f55a013 100644 --- a/src/scripts/northrend/nexus/nexus/commander_kolurg.cpp +++ b/src/scripts/northrend/nexus/nexus/commander_kolurg.cpp @@ -28,10 +28,10 @@ struct boss_commander_kolurgAI : public ScriptedAI boss_commander_kolurgAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit* who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) { //Return since we have no target if (!UpdateVictim()) @@ -39,7 +39,7 @@ struct boss_commander_kolurgAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) {} + void JustDied(Unit* /*killer*/) {} }; CreatureAI* GetAI_boss_commander_kolurg(Creature* pCreature) diff --git a/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp b/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp index 8dacef04c91..ef02baa38e6 100644 --- a/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp +++ b/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp @@ -28,13 +28,13 @@ struct boss_commander_stoutbeardAI : public ScriptedAI boss_commander_stoutbeardAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) { //Return since we have no target if (!UpdateVictim()) @@ -42,7 +42,7 @@ struct boss_commander_stoutbeardAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); } diff --git a/src/scripts/northrend/nexus/nexus/instance_nexus.cpp b/src/scripts/northrend/nexus/nexus/instance_nexus.cpp index cf94f14f8b9..db70245e3a4 100644 --- a/src/scripts/northrend/nexus/nexus/instance_nexus.cpp +++ b/src/scripts/northrend/nexus/nexus/instance_nexus.cpp @@ -48,7 +48,7 @@ struct instance_nexus : public ScriptedInstance Keristrasza = 0; } - void OnCreatureCreate(Creature *pCreature, bool bAdd) + void OnCreatureCreate(Creature *pCreature, bool /*bAdd*/) { Map::PlayerList const &players = instance->GetPlayers(); uint32 TeamInInstance = 0; @@ -110,7 +110,7 @@ struct instance_nexus : public ScriptedInstance } } - void OnGameObjectCreate(GameObject *pGo, bool bAdd) + void OnGameObjectCreate(GameObject *pGo, bool /*bAdd*/) { switch (pGo->GetEntry()) { diff --git a/src/scripts/northrend/nexus/oculus/boss_drakos.cpp b/src/scripts/northrend/nexus/oculus/boss_drakos.cpp index f4826702b5c..6796e399d45 100644 --- a/src/scripts/northrend/nexus/oculus/boss_drakos.cpp +++ b/src/scripts/northrend/nexus/oculus/boss_drakos.cpp @@ -74,7 +74,7 @@ struct boss_drakosAI : public ScriptedAI pInstance->SetData(DATA_DRAKOS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -144,14 +144,14 @@ struct boss_drakosAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); if (pInstance) pInstance->SetData(DATA_DRAKOS_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); } diff --git a/src/scripts/northrend/nexus/oculus/boss_eregos.cpp b/src/scripts/northrend/nexus/oculus/boss_eregos.cpp index 3f8e920b23f..94fb90ab206 100644 --- a/src/scripts/northrend/nexus/oculus/boss_eregos.cpp +++ b/src/scripts/northrend/nexus/oculus/boss_eregos.cpp @@ -89,15 +89,15 @@ struct boss_eregosAI : public ScriptedAI pInstance->SetData(DATA_EREGOS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_EREGOS_EVENT, IN_PROGRESS); } - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) { //Return since we have no target if (!UpdateVictim()) @@ -106,7 +106,7 @@ struct boss_eregosAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_EREGOS_EVENT, DONE); diff --git a/src/scripts/northrend/nexus/oculus/boss_urom.cpp b/src/scripts/northrend/nexus/oculus/boss_urom.cpp index 0c9e85f7641..12176ef4f8a 100644 --- a/src/scripts/northrend/nexus/oculus/boss_urom.cpp +++ b/src/scripts/northrend/nexus/oculus/boss_urom.cpp @@ -59,7 +59,7 @@ struct boss_uromAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_UROM_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -67,9 +67,9 @@ struct boss_uromAI : public ScriptedAI pInstance->SetData(DATA_UROM_EVENT, IN_PROGRESS); } - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) { //Return since we have no target if (!UpdateVictim()) @@ -77,14 +77,14 @@ struct boss_uromAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); if (pInstance) pInstance->SetData(DATA_UROM_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/northrend/nexus/oculus/boss_varos.cpp b/src/scripts/northrend/nexus/oculus/boss_varos.cpp index cd1132a030b..79034250a43 100644 --- a/src/scripts/northrend/nexus/oculus/boss_varos.cpp +++ b/src/scripts/northrend/nexus/oculus/boss_varos.cpp @@ -57,16 +57,16 @@ struct boss_varosAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_VAROS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) pInstance->SetData(DATA_VAROS_EVENT, IN_PROGRESS); } - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) { //Return since we have no target if (!UpdateVictim()) @@ -74,14 +74,14 @@ struct boss_varosAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); if (pInstance) pInstance->SetData(DATA_VAROS_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/northrend/nexus/oculus/instance_oculus.cpp b/src/scripts/northrend/nexus/oculus/instance_oculus.cpp index c19e8c509c3..48bb1b5bcd7 100644 --- a/src/scripts/northrend/nexus/oculus/instance_oculus.cpp +++ b/src/scripts/northrend/nexus/oculus/instance_oculus.cpp @@ -37,7 +37,7 @@ struct instance_oculus : public ScriptedInstance uint8 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/northrend/nexus/oculus/oculus.cpp b/src/scripts/northrend/nexus/oculus/oculus.cpp index 27ea4ec1218..685583532d5 100644 --- a/src/scripts/northrend/nexus/oculus/oculus.cpp +++ b/src/scripts/northrend/nexus/oculus/oculus.cpp @@ -63,7 +63,7 @@ bool GossipHello_npc_oculus_drake(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_oculus_drake(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_oculus_drake(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp b/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp index dff310ccb7b..378f2633907 100644 --- a/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp +++ b/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp @@ -272,7 +272,7 @@ struct boss_sartharionAI : public ScriptedAI pInstance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_SARTHARION_AGGRO,me); DoZoneInCombat(); @@ -284,7 +284,7 @@ struct boss_sartharionAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_SARTHARION_DEATH,me); @@ -301,7 +301,7 @@ struct boss_sartharionAI : public ScriptedAI } } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(RAND(SAY_SARTHARION_SLAY_1,SAY_SARTHARION_SLAY_2,SAY_SARTHARION_SLAY_3), me); } @@ -722,9 +722,9 @@ struct dummy_dragonAI : public ScriptedAI case NPC_VESPERON: { if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) - Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); else - Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); iTextId = WHISPER_OPEN_PORTAL; break; @@ -742,7 +742,7 @@ struct dummy_dragonAI : public ScriptedAI //Refresh respawnTime so time again are set to 30secs? } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { int32 iTextId = 0; uint32 uiSpellId = 0; @@ -818,14 +818,14 @@ struct mob_tenebronAI : public dummy_dragonAI m_uiHatchEggTimer = 30000; } - void Aggro(Unit* pWho) + void Aggro(Unit* /*pWho*/) { DoScriptText(SAY_TENEBRON_AGGRO, me); DoZoneInCombat(); DoCast(me, SPELL_POWER_OF_TENEBRON); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(RAND(SAY_TENEBRON_SLAY_1,SAY_TENEBRON_SLAY_2), me); /*if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) @@ -905,14 +905,14 @@ struct mob_shadronAI : public dummy_dragonAI me->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA); } - void Aggro(Unit* pWho) + void Aggro(Unit* /*pWho*/) { DoScriptText(SAY_SHADRON_AGGRO,me); DoZoneInCombat(); DoCast(me, SPELL_POWER_OF_SHADRON); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(RAND(SAY_SHADRON_SLAY_1,SAY_SHADRON_SLAY_2), me); /*if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) @@ -989,14 +989,14 @@ struct mob_vesperonAI : public dummy_dragonAI m_uiAcolyteVesperonTimer = 60000; } - void Aggro(Unit* pWho) + void Aggro(Unit* /*pWho*/) { DoScriptText(SAY_VESPERON_AGGRO,me); DoZoneInCombat(); DoCast(me, SPELL_POWER_OF_VESPERON); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(RAND(SAY_VESPERON_SLAY_1,SAY_VESPERON_SLAY_2), me); /*if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) @@ -1088,11 +1088,11 @@ struct mob_acolyte_of_shadronAI : public ScriptedAI me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { - Creature* pDebuffTarget = NULL; + //Creature* pDebuffTarget = NULL; Map *map = me->GetMap(); if (map->IsDungeon()) { @@ -1130,7 +1130,7 @@ struct mob_acolyte_of_shadronAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 /*uiDiff*/) { if (!UpdateVictim()) return; @@ -1166,7 +1166,7 @@ struct mob_acolyte_of_vesperonAI : public ScriptedAI DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { // remove twilight torment on Vesperon if (pInstance) @@ -1201,7 +1201,7 @@ struct mob_acolyte_of_vesperonAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 /*uiDiff*/) { if (!UpdateVictim()) return; @@ -1252,8 +1252,8 @@ struct mob_twilight_eggsAI : public Scripted_NoMovementAI else m_uiHatchEggTimer -= uiDiff; } - void AttackStart(Unit* pWho) {} - void MoveInLineOfSight(Unit* pWho) {} + void AttackStart(Unit* /*pWho*/) {} + void MoveInLineOfSight(Unit* /*pWho*/) {} }; CreatureAI* GetAI_mob_twilight_eggs(Creature* pCreature) diff --git a/src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp b/src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp index d80985dc300..7ef8e03c779 100644 --- a/src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp +++ b/src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp @@ -27,7 +27,7 @@ struct instance_obsidian_sanctum : public ScriptedInstance m_uiVesperonGUID = 0; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/northrend/sholazar_basin.cpp b/src/scripts/northrend/sholazar_basin.cpp index 4364caebfc4..b503766d60f 100644 --- a/src/scripts/northrend/sholazar_basin.cpp +++ b/src/scripts/northrend/sholazar_basin.cpp @@ -102,7 +102,7 @@ struct npc_injured_rainspeaker_oracleAI : public npc_escortAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (!HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -128,7 +128,7 @@ bool GossipHello_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCrea return true; } -bool GossipSelect_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -149,7 +149,7 @@ bool GossipSelect_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCre return true; } -bool QuestAccept_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCreature, Quest const *_Quest) +bool QuestAccept_npc_injured_rainspeaker_oracle(Player* /*pPlayer*/, Creature* pCreature, Quest const * /*_Quest*/) { DoScriptText(SAY_QUEST_ACCEPT_IRO, pCreature); return false; @@ -195,7 +195,7 @@ bool GossipHello_npc_vekjik(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_vekjik(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_vekjik(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -245,7 +245,7 @@ bool GossipHello_npc_avatar_of_freya(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_avatar_of_freya(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_avatar_of_freya(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -284,7 +284,7 @@ struct npc_bushwhackerAI : public ScriptedAI me->GetMotionMaster()->MovePoint(0,pSummoner->GetPositionX(),pSummoner->GetPositionY(),pSummoner->GetPositionZ()); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 /*uiDiff*/) { if (!UpdateVictim()) return; diff --git a/src/scripts/northrend/storm_peaks.cpp b/src/scripts/northrend/storm_peaks.cpp index e9261e9b837..2d674c81652 100644 --- a/src/scripts/northrend/storm_peaks.cpp +++ b/src/scripts/northrend/storm_peaks.cpp @@ -54,7 +54,7 @@ bool GossipHello_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -92,7 +92,7 @@ bool GossipHello_npc_frostborn_scout(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_frostborn_scout(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_frostborn_scout(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -145,7 +145,7 @@ bool GossipHello_npc_thorim(Player* pPlayer, Creature* pCreature) return false; } -bool GossipSelect_npc_thorim(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_thorim(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -251,7 +251,7 @@ struct npc_victorious_challengerAI : public ScriptedAI DoMeleeAttackIfReady(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { me->RestoreFaction(); } @@ -273,7 +273,7 @@ bool GossipHello_npc_victorious_challenger(Player* pPlayer, Creature* pCreature) return false; } -bool GossipSelect_npc_victorious_challenger(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_victorious_challenger(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -322,7 +322,7 @@ bool GossipHello_npc_loklira_crone(Player* pPlayer, Creature* pCreature) return false; } -bool GossipSelect_npc_loklira_crone(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_loklira_crone(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp index f4a8be0edff..c2da2a24e71 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp @@ -155,7 +155,7 @@ struct boss_bjarngrimAI : public ScriptedAI m_pInstance->SetData(TYPE_BJARNGRIM, NOT_STARTED); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); @@ -166,12 +166,12 @@ struct boss_bjarngrimAI : public ScriptedAI m_pInstance->SetData(TYPE_BJARNGRIM, IN_PROGRESS); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp index 8ed7f1294d2..ecf61188b3e 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp @@ -109,7 +109,7 @@ struct boss_ionarAI : public ScriptedAI pInstance->SetData(TYPE_IONAR, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -117,7 +117,7 @@ struct boss_ionarAI : public ScriptedAI pInstance->SetData(TYPE_IONAR, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -127,7 +127,7 @@ struct boss_ionarAI : public ScriptedAI pInstance->SetData(TYPE_IONAR, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } @@ -158,7 +158,7 @@ struct boss_ionarAI : public ScriptedAI } } - void DamageTaken(Unit *pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) { if (me->GetVisibility() == VISIBILITY_OFF) uiDamage = 0; @@ -268,7 +268,7 @@ CreatureAI* GetAI_boss_ionar(Creature* pCreature) return new boss_ionarAI(pCreature); } -bool EffectDummyCreature_boss_ionar(Unit* pCaster, uint32 uiSpellId, uint32 uiEffIndex, Creature* pCreatureTarget) +bool EffectDummyCreature_boss_ionar(Unit* /*pCaster*/, uint32 uiSpellId, uint32 uiEffIndex, Creature* pCreatureTarget) { //always check spellid and effectindex if (uiSpellId == SPELL_DISPERSE && uiEffIndex == 0) @@ -322,7 +322,7 @@ struct mob_spark_of_ionarAI : public ScriptedAI me->ForcedDespawn(); } - void DamageTaken(Unit *pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) { uiDamage = 0; } diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp index f97cf3f6893..5ced0cf0874 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp @@ -93,7 +93,7 @@ struct boss_lokenAI : public ScriptedAI m_pInstance->SetData(TYPE_LOKEN, NOT_STARTED); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); @@ -103,7 +103,7 @@ struct boss_lokenAI : public ScriptedAI m_pInstance->SetData(TYPE_LOKEN, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_DEATH, me); @@ -126,7 +126,7 @@ struct boss_lokenAI : public ScriptedAI m_pInstance->SetData(TYPE_LOKEN, DONE); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp index 824485cd34f..184050e3103 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp @@ -114,7 +114,7 @@ struct boss_volkhanAI : public ScriptedAI m_pInstance->SetData(TYPE_VOLKHAN, NOT_STARTED); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); @@ -135,7 +135,7 @@ struct boss_volkhanAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_DEATH, me); DespawnGolem(); @@ -159,7 +159,7 @@ struct boss_volkhanAI : public ScriptedAI } } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } @@ -200,7 +200,7 @@ struct boss_volkhanAI : public ScriptedAI } } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) { if (pSpell->Id == SPELL_TEMPER_DUMMY) m_bIsStriking = true; @@ -397,7 +397,7 @@ struct mob_molten_golemAI : public ScriptedAI } } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) { if (uiDamage > me->GetHealth()) { @@ -415,7 +415,7 @@ struct mob_molten_golemAI : public ScriptedAI } } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) { //this is the dummy effect of the spells if (pSpell->Id == SPELL_SHATTER_N || pSpell->Id == SPELL_SHATTER_H) diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp index 0b63abd1a08..46cd5c9cccc 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp @@ -64,7 +64,7 @@ struct instance_halls_of_lightning : public ScriptedInstance m_uiLokenGlobeGUID = 0; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -83,7 +83,7 @@ struct instance_halls_of_lightning : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp b/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp index 574e39f71a4..0674b7c79eb 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp @@ -62,7 +62,7 @@ struct boss_krystallusAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_KRYSTALLUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -116,7 +116,7 @@ struct boss_krystallusAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -124,7 +124,7 @@ struct boss_krystallusAI : public ScriptedAI pInstance->SetData(DATA_KRYSTALLUS_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp index b4544cfc129..b3ec294f419 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp @@ -66,7 +66,7 @@ struct boss_maiden_of_griefAI : public ScriptedAI pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -135,7 +135,7 @@ struct boss_maiden_of_griefAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -152,7 +152,7 @@ struct boss_maiden_of_griefAI : public ScriptedAI itr->getSource()->CompletedAchievement(AchievGoodGrief); } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp index 6dc338b0f93..68c3e34e6bf 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp @@ -106,7 +106,7 @@ struct boss_sjonnirAI : public ScriptedAI pInstance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -191,7 +191,7 @@ struct boss_sjonnirAI : public ScriptedAI lSummons.Summon(summon); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); lSummons.DespawnAll(); @@ -203,7 +203,7 @@ struct boss_sjonnirAI : public ScriptedAI pInstance->DoCompleteAchievement(ACHIEV_ABUSE_THE_OOZE); } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; @@ -266,7 +266,7 @@ struct mob_iron_sludgeAI : public ScriptedAI ScriptedInstance* pInstance; - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (pInstance) if (Creature* pSjonnir = Unit::GetCreature(*me, pInstance->GetData64(DATA_SJONNIR))) diff --git a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp index a04f2ce203b..8febdaab879 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp @@ -361,7 +361,7 @@ struct npc_brann_hosAI : public npc_escortAI Start(); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 & /*damage*/) { if (!bHasBeenDamaged) bHasBeenDamaged = true; @@ -685,7 +685,7 @@ bool GossipHello_npc_brann_hos(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_brann_hos(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_brann_hos(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1 || uiAction == GOSSIP_ACTION_INFO_DEF+2) { diff --git a/src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp index 7c1c9da9142..69bb3779e70 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp @@ -62,7 +62,7 @@ struct instance_halls_of_stone : public ScriptedInstance m_auiEncounter[i] = NOT_STARTED; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -76,7 +76,7 @@ struct instance_halls_of_stone : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp b/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp index af45b5c857c..e8f67346adb 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp @@ -129,7 +129,7 @@ struct boss_algalonAI : public ScriptedAI pInstance->SetData(TYPE_ALGALON, IN_PROGRESS); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } diff --git a/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp b/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp index 4d26ab19332..8d3ae4d3431 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp @@ -155,7 +155,7 @@ struct boss_steelbreakerAI : public ScriptedAI ScriptedInstance* pInstance; uint32 phase; - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_STEELBREAKER_AGGRO, me); DoZoneInCombat(); @@ -175,7 +175,7 @@ struct boss_steelbreakerAI : public ScriptedAI events.RescheduleEvent(EVENT_OVERWHELMING_POWER, rand()%5000); } - void DamageTaken(Unit* pKiller, uint32 &damage) + void DamageTaken(Unit* /*pKiller*/, uint32 &damage) { if (damage >= me->GetHealth()) { @@ -191,14 +191,14 @@ struct boss_steelbreakerAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1,SAY_STEELBREAKER_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } - void KilledUnit(Unit *who) + void KilledUnit(Unit * /*who*/) { DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1,SAY_STEELBREAKER_SLAY_2), me); @@ -206,7 +206,7 @@ struct boss_steelbreakerAI : public ScriptedAI DoCast(me, SPELL_ELECTRICAL_CHARGE); } - void SpellHit(Unit *from, const SpellEntry *spell) + void SpellHit(Unit * /*from*/, const SpellEntry *spell) { if (spell->Id == SPELL_SUPERCHARGE) UpdatePhase(); @@ -268,7 +268,7 @@ struct boss_runemaster_molgeimAI : public ScriptedAI EventMap events; uint32 phase; - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_MOLGEIM_AGGRO, me); DoZoneInCombat(); @@ -288,7 +288,7 @@ struct boss_runemaster_molgeimAI : public ScriptedAI events.RescheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000,30000)); } - void DamageTaken(Unit* pKiller, uint32 &damage) + void DamageTaken(Unit* /*pKiller*/, uint32 &damage) { if (damage >= me->GetHealth()) { @@ -304,19 +304,19 @@ struct boss_runemaster_molgeimAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(RAND(SAY_MOLGEIM_DEATH_1,SAY_MOLGEIM_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } - void KilledUnit(Unit *who) + void KilledUnit(Unit * /*who*/) { DoScriptText(RAND(SAY_MOLGEIM_SLAY_1,SAY_MOLGEIM_SLAY_2), me); } - void SpellHit(Unit *from, const SpellEntry *spell) + void SpellHit(Unit * /*from*/, const SpellEntry *spell) { if (spell->Id == SPELL_SUPERCHARGE) UpdatePhase(); @@ -383,7 +383,7 @@ struct mob_lightning_elementalAI : public ScriptedAI AttackStart(pTarget); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!me->isInCombat()) return; @@ -435,7 +435,7 @@ struct boss_stormcaller_brundirAI : public ScriptedAI ScriptedInstance* pInstance; uint32 phase; - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_BRUNDIR_AGGRO, me); DoZoneInCombat(); @@ -458,7 +458,7 @@ struct boss_stormcaller_brundirAI : public ScriptedAI } } - void DamageTaken(Unit* pKiller, uint32 &damage) + void DamageTaken(Unit* /*pKiller*/, uint32 &damage) { if (damage >= me->GetHealth()) { @@ -474,19 +474,19 @@ struct boss_stormcaller_brundirAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(RAND(SAY_BRUNDIR_DEATH_1,SAY_BRUNDIR_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } - void KilledUnit(Unit *who) + void KilledUnit(Unit * /*who*/) { DoScriptText(RAND(SAY_BRUNDIR_SLAY_1,SAY_BRUNDIR_SLAY_2), me); } - void SpellHit(Unit *from, const SpellEntry *spell) + void SpellHit(Unit * /*from*/, const SpellEntry *spell) { if (spell->Id == SPELL_SUPERCHARGE) UpdatePhase(); diff --git a/src/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp b/src/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp index f0864f4a212..41c0f317f4e 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp @@ -50,24 +50,24 @@ struct boss_auriaya_AI : public BossAI SONIC_SCREECH_Timer = 30000; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO,me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); } - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp b/src/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp index 8dfd0630e39..d0b7cff3006 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp @@ -102,7 +102,7 @@ struct boss_flame_leviathanAI : public BossAI me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); @@ -125,13 +125,13 @@ struct boss_flame_leviathanAI : public BossAI AttackStart(pTarget); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (spell->Id == 62472) vehicle->InstallAllAccessories(); @@ -310,7 +310,7 @@ struct boss_flame_leviathan_safety_containerAI : public PassiveAI { boss_flame_leviathan_safety_containerAI(Creature *c) : PassiveAI(c) {} - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) { if (id == me->GetEntry()) { @@ -320,7 +320,7 @@ struct boss_flame_leviathan_safety_containerAI : public PassiveAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!me->GetVehicle() && me->isSummon() && me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE) me->GetMotionMaster()->MoveFall(409.8f, me->GetEntry()); @@ -334,12 +334,12 @@ struct spell_pool_of_tarAI : public TriggerAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void DamageTaken(Unit *who, uint32 &damage) + void DamageTaken(Unit * /*who*/, uint32 &damage) { damage = 0; } - void SpellHit(Unit* caster, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->SchoolMask & SPELL_SCHOOL_MASK_FIRE && !me->HasAura(SPELL_BLAZE)) me->CastSpell(me, SPELL_BLAZE, true); diff --git a/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp b/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp index 3b06f0d72e4..1c4c2701731 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp @@ -62,18 +62,18 @@ struct boss_freyaAI : public BossAI _Reset(); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); _EnterCombat(); diff --git a/src/scripts/northrend/ulduar/ulduar/boss_hodir.cpp b/src/scripts/northrend/ulduar/ulduar/boss_hodir.cpp index 4b6664990b2..6facd8ac639 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_hodir.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_hodir.cpp @@ -43,18 +43,18 @@ struct boss_hodirAI : public BossAI _Reset(); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); _EnterCombat(); diff --git a/src/scripts/northrend/ulduar/ulduar/boss_ignis.cpp b/src/scripts/northrend/ulduar/ulduar/boss_ignis.cpp index 40d91b94945..053b58cbe99 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_ignis.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_ignis.cpp @@ -52,24 +52,24 @@ struct boss_ignis_AI : public BossAI uiSlagPotTimer = 100; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO,me); _EnterCombat(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); } - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp b/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp index 3267d884dde..1fdfd38c7bf 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp @@ -68,18 +68,18 @@ struct boss_kologarnAI : public BossAI me->Attack(who, true); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* /*who*/) { DoScriptText(RAND(SAY_SLAY_2,SAY_SLAY_2), me); } - void PassengerBoarded(Unit *who, int8 seatId, bool apply) + void PassengerBoarded(Unit *who, int8 /*seatId*/, bool apply) { if (who->GetTypeId() == TYPEID_UNIT) { @@ -92,7 +92,7 @@ struct boss_kologarnAI : public BossAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); _EnterCombat(); diff --git a/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp b/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp index 0c06e582838..c61f1046474 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp @@ -90,17 +90,17 @@ struct boss_razorscaleAI : public BossAI me->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_KILL, me); } @@ -261,7 +261,7 @@ struct boss_razorscaleAI : public BossAI SummonAddsTimer = 45000; } - void FlyPhase(uint8 Phase, const uint32 diff) + void FlyPhase(uint8 Phase, const uint32 /*diff*/) { const float x = 587.54; const float y = -174.92; diff --git a/src/scripts/northrend/ulduar/ulduar/boss_thorim.cpp b/src/scripts/northrend/ulduar/ulduar/boss_thorim.cpp index 2d081093985..bbab077e10e 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_thorim.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_thorim.cpp @@ -58,18 +58,18 @@ struct boss_thorimAI : public BossAI _EnterEvadeMode(); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me); _EnterCombat(); diff --git a/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp b/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp index 7828c4ec1ff..7da871758ae 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp @@ -215,7 +215,7 @@ struct boss_xt002_AI : public BossAI heart_exposed = 0; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); _EnterCombat(); @@ -253,12 +253,12 @@ struct boss_xt002_AI : public BossAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); @@ -516,7 +516,7 @@ struct mob_xt002_heartAI : public ScriptedAI ScriptedInstance* m_pInstance; - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (m_pInstance) if (Creature* pXT002 = me->GetCreature(*me, m_pInstance->GetData64(TYPE_XT002))) @@ -527,7 +527,7 @@ struct mob_xt002_heartAI : public ScriptedAI me->RemoveAurasDueToSpell(SPELL_EXPOSED_HEART); } - void DamageTaken(Unit *pDone, uint32 &damage) + void DamageTaken(Unit * /*pDone*/, uint32 &damage) { if (Creature* pXT002 = me->GetCreature(*me, m_pInstance->GetData64(TYPE_XT002))) if (pXT002->AI()) @@ -569,7 +569,7 @@ struct mob_scrapbotAI : public ScriptedAI me->GetMotionMaster()->MoveChase(pXT002); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (Creature* pXT002 = me->GetCreature(*me, m_pInstance->GetData64(TYPE_XT002))) { @@ -673,12 +673,12 @@ struct mob_boombotAI : public ScriptedAI me->GetMotionMaster()->MoveChase(pXT002); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { DoCast(SPELL_BOOM); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (Creature* pXT002 = me->GetCreature(*me, m_pInstance->GetData64(TYPE_XT002))) { diff --git a/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp b/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp index 7e7d176f0a5..62dab2d3f7a 100644 --- a/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp +++ b/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp @@ -90,7 +90,7 @@ struct instance_ulduar : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp b/src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp index 5d6c66a197a..44f9e86b69c 100644 --- a/src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp +++ b/src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp @@ -48,7 +48,7 @@ bool GoHello_ulduar_teleporter(Player *pPlayer, GameObject *pGO) return true; } -bool GOSelect_ulduar_teleporter(Player *pPlayer, GameObject *pGO, uint32 sender, uint32 action) +bool GOSelect_ulduar_teleporter(Player *pPlayer, GameObject * /*pGO*/, uint32 sender, uint32 action) { if (sender != GOSSIP_SENDER_MAIN) return true; if (!pPlayer->getAttackers().empty()) return true; diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 969d74f9867..77f824c48d5 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -112,7 +112,7 @@ struct boss_ingvar_the_plundererAI : public ScriptedAI pInstance->SetData(DATA_INGVAR_EVENT, NOT_STARTED); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth() && !bIsUndead) { @@ -151,7 +151,7 @@ struct boss_ingvar_the_plundererAI : public ScriptedAI DoScriptText(YELL_AGGRO_2,me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(YELL_AGGRO_1,me); @@ -159,7 +159,7 @@ struct boss_ingvar_the_plundererAI : public ScriptedAI pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(YELL_DEAD_2,me); @@ -167,7 +167,7 @@ struct boss_ingvar_the_plundererAI : public ScriptedAI pInstance->SetData(DATA_INGVAR_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { if (bIsUndead) DoScriptText(YELL_KILL_1,me); @@ -234,7 +234,7 @@ struct boss_ingvar_the_plundererAI : public ScriptedAI Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1); if (pTarget) { - Creature* temp = me->SummonCreature(ENTRY_THROW_TARGET,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); + me->SummonCreature(ENTRY_THROW_TARGET,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); DoCast(me, SPELL_SHADOW_AXE_SUMMON); } @@ -333,9 +333,9 @@ struct mob_annhylde_the_callerAI : public ScriptedAI } } - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void EnterCombat(Unit *who) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { if (uiResurectTimer) @@ -402,9 +402,9 @@ struct mob_ingvar_throw_dummyAI : public ScriptedAI } uiDespawnTimer = 7000; } - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void EnterCombat(Unit *who) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { if (uiDespawnTimer <= diff) diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp index 9fbb1121d24..b365de8996f 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -76,9 +76,9 @@ struct mob_frost_tombAI : public ScriptedAI } void Reset(){ FrostTombGUID = 0; } - void EnterCombat(Unit* who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void JustDied(Unit *killer) { @@ -93,7 +93,7 @@ struct mob_frost_tombAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { Unit* temp = Unit::GetUnit((*me),FrostTombGUID); if ((temp && temp->isAlive() && !temp->HasAura(SPELL_FROST_TOMB)) || !temp) @@ -131,7 +131,7 @@ struct boss_kelesethAI : public ScriptedAI pInstance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; @@ -139,7 +139,7 @@ struct boss_kelesethAI : public ScriptedAI DoScriptText(SAY_KILL, me); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -162,7 +162,7 @@ struct boss_kelesethAI : public ScriptedAI pInstance->SetData(DATA_PRINCEKELESETH_EVENT, DONE); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); @@ -250,7 +250,7 @@ struct mob_vrykul_skeletonAI : public ScriptedAI isDead = false; } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} void DamageTaken(Unit *done_by, uint32 &damage) { if (done_by->GetGUID() == me->GetGUID()) diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index 4e93da95a4d..2146d37635b 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -92,7 +92,7 @@ struct boss_skarvald_the_constructorAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (!ghost && pInstance) { @@ -136,7 +136,7 @@ struct boss_skarvald_the_constructorAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { if (!ghost) { @@ -240,7 +240,7 @@ struct boss_dalronn_the_controllerAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (!ghost && pInstance) { @@ -284,7 +284,7 @@ struct boss_dalronn_the_controllerAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { if (!ghost) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp index 2a471fb07de..03f97b1d27e 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp @@ -113,7 +113,7 @@ struct instance_utgarde_keep : public ScriptedInstance return NULL; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -124,7 +124,7 @@ struct instance_utgarde_keep : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp index b5b064db86a..95825aa49b6 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp @@ -62,7 +62,7 @@ struct npc_dragonflayer_forge_masterAI : public ScriptedAI } } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) @@ -82,7 +82,7 @@ struct npc_dragonflayer_forge_masterAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) @@ -132,7 +132,7 @@ struct npc_dragonflayer_forge_masterAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index d30520f2c1b..e5b3690396b 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -121,7 +121,7 @@ struct boss_palehoofAI : public ScriptedAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -177,7 +177,7 @@ struct boss_palehoofAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); if (pInstance) @@ -187,7 +187,7 @@ struct boss_palehoofAI : public ScriptedAI pTemp->DisappearAndDie(); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } @@ -326,7 +326,7 @@ struct mob_ravenous_furbolgAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -434,7 +434,7 @@ struct mob_frenzied_worgenAI : public ScriptedAI pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -542,7 +542,7 @@ struct mob_ferocious_rhinoAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -656,7 +656,7 @@ struct mob_massive_jormungarAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -709,7 +709,7 @@ struct mob_palehoof_orbAI : public ScriptedAI { if (currentPhase<5&¤tPhase >= 0) { - Creature *pNext; + Creature *pNext = NULL; switch(currentPhase) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; @@ -739,7 +739,7 @@ struct mob_palehoof_orbAI : public ScriptedAI return; if (id<0 || id>4) return; - Creature *pNext; + Creature *pNext = NULL; switch(id) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; @@ -762,7 +762,7 @@ CreatureAI* GetAI_mob_palehoof_orb(Creature* pCreature) -bool GOHello_palehoof_sphere(Player *pPlayer, GameObject *pGO) +bool GOHello_palehoof_sphere(Player * /*pPlayer*/, GameObject *pGO) { ScriptedInstance *pInstance = pGO->GetInstanceData(); diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp index 7570af83f9f..0ccd7a4917b 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp @@ -104,7 +104,7 @@ struct boss_skadiAI : public ScriptedAI pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -171,7 +171,7 @@ struct boss_skadiAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -179,7 +179,7 @@ struct boss_skadiAI : public ScriptedAI pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); } @@ -219,7 +219,7 @@ struct boss_skadiAI : public ScriptedAI uint8 uiMaxSpawn = DUNGEON_MODE(5, 6); for (uint8 i = 0; i < uiMaxSpawn; ++i) { - Creature* pTemp; + Creature* pTemp = NULL; switch (urand(0,2)) { case 0: pTemp = me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc[spot].x+rand()%5, SpawnLoc[spot].y+rand()%5, SpawnLoc[spot].z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp index 3015cc3b174..aae1015ddab 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp @@ -131,7 +131,7 @@ struct boss_svalaAI : public ScriptedAI } } - void AttackStart(Unit* who) {} + void AttackStart(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -209,14 +209,14 @@ struct mob_ritual_channelerAI : public Scripted_NoMovementAI } // called by svala sorrowgrave to set guid of victim - void DoAction(uint32 action) + void DoAction(uint32 /*action*/) { if (pInstance) if (Unit *pVictim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER))) DoCast(pVictim, SPELL_PARALYZE); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { } }; @@ -264,7 +264,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -353,7 +353,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI } } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* /*pVictim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp index 164f24faedd..456f7d04990 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp @@ -156,7 +156,7 @@ struct boss_ymironAI : public ScriptedAI pInstance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -325,7 +325,7 @@ struct boss_ymironAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -336,7 +336,7 @@ struct boss_ymironAI : public ScriptedAI pInstance->SetData(DATA_KING_YMIRON_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); } diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp index 69e608a8f3c..b49e59f777a 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp @@ -75,7 +75,7 @@ struct instance_pinnacle : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -92,7 +92,7 @@ struct instance_pinnacle : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/northrend/vault_of_archavon/boss_archavon.cpp b/src/scripts/northrend/vault_of_archavon/boss_archavon.cpp index f052600900b..11d432e94c6 100644 --- a/src/scripts/northrend/vault_of_archavon/boss_archavon.cpp +++ b/src/scripts/northrend/vault_of_archavon/boss_archavon.cpp @@ -72,15 +72,15 @@ struct boss_archavonAI : public ScriptedAI pInstance->SetData(DATA_ARCHAVON_EVENT, NOT_STARTED); } - void KilledUnit(Unit* Victim){} + void KilledUnit(Unit* /*Victim*/) {} - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(DATA_ARCHAVON_EVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000); @@ -151,7 +151,7 @@ struct mob_archavon_warderAI : public ScriptedAI //npc 32353 events.Reset(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); events.ScheduleEvent(EVENT_ROCK_SHOWER, 2000); diff --git a/src/scripts/northrend/vault_of_archavon/boss_emalon.cpp b/src/scripts/northrend/vault_of_archavon/boss_emalon.cpp index f849f4d39ed..92a0331708e 100644 --- a/src/scripts/northrend/vault_of_archavon/boss_emalon.cpp +++ b/src/scripts/northrend/vault_of_archavon/boss_emalon.cpp @@ -80,7 +80,7 @@ struct boss_emalonAI : public BossAI summoned->AI()->AttackStart(me->getVictim()); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (!summons.empty()) { @@ -173,7 +173,7 @@ struct mob_tempest_minionAI : public ScriptedAI uiOverchargedTimer = 0; } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (Creature *pEmalon = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EMALON) : 0)) { @@ -185,7 +185,7 @@ struct mob_tempest_minionAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { DoZoneInCombat(); events.ScheduleEvent(EVENT_SHOCK, 20000); diff --git a/src/scripts/northrend/vault_of_archavon/boss_koralon.cpp b/src/scripts/northrend/vault_of_archavon/boss_koralon.cpp index 7503d6c8fd8..61843647136 100644 --- a/src/scripts/northrend/vault_of_archavon/boss_koralon.cpp +++ b/src/scripts/northrend/vault_of_archavon/boss_koralon.cpp @@ -82,15 +82,15 @@ struct boss_koralonAI : public ScriptedAI pInstance->SetData(DATA_KORALON_EVENT, NOT_STARTED); } - void KilledUnit(Unit* Victim) {} + void KilledUnit(Unit* /*Victim*/) {} - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(DATA_KORALON_EVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); @@ -159,7 +159,7 @@ struct mob_flame_warderAI : public ScriptedAI events.Reset(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); diff --git a/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp b/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp index 554c36b0789..250238f1c12 100644 --- a/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp +++ b/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp @@ -72,15 +72,15 @@ struct boss_toravonAI : public ScriptedAI pInstance->SetData(DATA_TORAVON_EVENT, NOT_STARTED); } - void KilledUnit(Unit* Victim) {} + void KilledUnit(Unit* /*Victim*/) {} - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(DATA_TORAVON_EVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); @@ -141,7 +141,7 @@ struct mob_frost_warderAI : public ScriptedAI events.Reset(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); @@ -188,7 +188,7 @@ struct mob_frozen_orbAI : public ScriptedAI killtimer = 60000; // if after this time there is no victim -> destroy! } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); } @@ -231,7 +231,7 @@ struct mob_frozen_orb_stalkerAI : public Scripted_NoMovementAI ScriptedInstance *pInstance; bool spawned; - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!spawned) { diff --git a/src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp b/src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp index b37da980936..a7183921cce 100644 --- a/src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp +++ b/src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp @@ -41,7 +41,7 @@ struct instance_archavon : public ScriptedInstance return false; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature *creature, bool /*add*/) { switch(creature->GetEntry()) { diff --git a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp index aebca89f345..589e69a6f18 100644 --- a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp +++ b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp @@ -65,7 +65,7 @@ struct boss_cyanigosaAI : public ScriptedAI pInstance->SetData(DATA_CYANIGOSA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_TRANSFORM); @@ -74,7 +74,7 @@ struct boss_cyanigosaAI : public ScriptedAI pInstance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -124,7 +124,7 @@ struct boss_cyanigosaAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -132,7 +132,7 @@ struct boss_cyanigosaAI : public ScriptedAI pInstance->SetData(DATA_CYANIGOSA_EVENT, DONE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/northrend/violet_hold/boss_erekem.cpp b/src/scripts/northrend/violet_hold/boss_erekem.cpp index 8773040c81d..a9cc7393af4 100644 --- a/src/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/scripts/northrend/violet_hold/boss_erekem.cpp @@ -106,7 +106,7 @@ struct boss_erekemAI : public ScriptedAI } } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_EARTH_SHIELD); @@ -127,7 +127,7 @@ struct boss_erekemAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -190,7 +190,7 @@ struct boss_erekemAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -209,7 +209,7 @@ struct boss_erekemAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; @@ -279,7 +279,7 @@ struct mob_erekem_guardAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/scripts/northrend/violet_hold/boss_ichoron.cpp index cd7c4b2fb8b..a28bfdffb7c 100644 --- a/src/scripts/northrend/violet_hold/boss_ichoron.cpp +++ b/src/scripts/northrend/violet_hold/boss_ichoron.cpp @@ -116,7 +116,7 @@ struct boss_ichoronAI : public ScriptedAI } } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); @@ -195,7 +195,7 @@ struct boss_ichoronAI : public ScriptedAI me->GetMotionMaster()->MoveChase(me->getVictim()); } - void MoveInLineOfSight(Unit* pWho) {} + void MoveInLineOfSight(Unit* /*pWho*/) {} void UpdateAI(const uint32 uiDiff) { @@ -266,7 +266,7 @@ struct boss_ichoronAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -309,7 +309,7 @@ struct boss_ichoronAI : public ScriptedAI m_waterElements.remove(pSummoned->GetGUID()); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; @@ -338,7 +338,7 @@ struct mob_ichor_globuleAI : public ScriptedAI uiRangeCheck_Timer = 1000; } - void AttackStart(Unit* pWho) + void AttackStart(Unit* /*pWho*/) { return; } @@ -364,7 +364,7 @@ struct mob_ichor_globuleAI : public ScriptedAI else uiRangeCheck_Timer -= uiDiff; } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { DoCast(me, SPELL_SPLASH); if (Creature* pIchoron = Unit::GetCreature(*me, pInstance->GetData64(DATA_ICHORON))) diff --git a/src/scripts/northrend/violet_hold/boss_lavanthor.cpp b/src/scripts/northrend/violet_hold/boss_lavanthor.cpp index c9f1a1c4ba8..d8cd3a4962f 100644 --- a/src/scripts/northrend/violet_hold/boss_lavanthor.cpp +++ b/src/scripts/northrend/violet_hold/boss_lavanthor.cpp @@ -52,7 +52,7 @@ struct boss_lavanthorAI : public ScriptedAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) { @@ -83,7 +83,7 @@ struct boss_lavanthorAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -121,7 +121,7 @@ struct boss_lavanthorAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { diff --git a/src/scripts/northrend/violet_hold/boss_moragg.cpp b/src/scripts/northrend/violet_hold/boss_moragg.cpp index 9cc769be04d..6d283c7bfb4 100644 --- a/src/scripts/northrend/violet_hold/boss_moragg.cpp +++ b/src/scripts/northrend/violet_hold/boss_moragg.cpp @@ -45,7 +45,7 @@ struct boss_moraggAI : public ScriptedAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) { @@ -76,7 +76,7 @@ struct boss_moraggAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -99,7 +99,7 @@ struct boss_moraggAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) { diff --git a/src/scripts/northrend/violet_hold/boss_xevozz.cpp b/src/scripts/northrend/violet_hold/boss_xevozz.cpp index edb78b68f6b..2633705c1b7 100644 --- a/src/scripts/northrend/violet_hold/boss_xevozz.cpp +++ b/src/scripts/northrend/violet_hold/boss_xevozz.cpp @@ -131,7 +131,7 @@ struct boss_xevozzAI : public ScriptedAI } } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) @@ -149,7 +149,7 @@ struct boss_xevozzAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* pWho) {} + void MoveInLineOfSight(Unit* /*pWho*/) {} void UpdateAI(const uint32 uiDiff) { @@ -187,7 +187,7 @@ struct boss_xevozzAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/northrend/violet_hold/boss_zuramat.cpp b/src/scripts/northrend/violet_hold/boss_zuramat.cpp index f6dcf7c86b1..da75ed94fc2 100644 --- a/src/scripts/northrend/violet_hold/boss_zuramat.cpp +++ b/src/scripts/northrend/violet_hold/boss_zuramat.cpp @@ -79,7 +79,7 @@ struct boss_zuramatAI : public ScriptedAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) @@ -97,7 +97,7 @@ struct boss_zuramatAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -127,7 +127,7 @@ struct boss_zuramatAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -146,7 +146,7 @@ struct boss_zuramatAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; diff --git a/src/scripts/northrend/violet_hold/instance_violet_hold.cpp b/src/scripts/northrend/violet_hold/instance_violet_hold.cpp index befe0f9cbf4..4d993eccd27 100644 --- a/src/scripts/northrend/violet_hold/instance_violet_hold.cpp +++ b/src/scripts/northrend/violet_hold/instance_violet_hold.cpp @@ -174,7 +174,7 @@ struct instance_violet_hold : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/northrend/violet_hold/violet_hold.cpp b/src/scripts/northrend/violet_hold/violet_hold.cpp index 6c1b33a77bf..49883b5dbf3 100644 --- a/src/scripts/northrend/violet_hold/violet_hold.cpp +++ b/src/scripts/northrend/violet_hold/violet_hold.cpp @@ -69,7 +69,7 @@ struct npc_sinclariAI : public ScriptedAI } } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -169,7 +169,7 @@ bool GossipHello_npc_sinclari(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_sinclari(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_sinclari(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -203,8 +203,8 @@ struct npc_teleportation_portalAI : public ScriptedAI bPortalGuardianOrKeeperSpawn = false; } - void EnterCombat(Unit *who) {} - void MoveInLineOfSight(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} + void MoveInLineOfSight(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -244,7 +244,7 @@ struct npc_teleportation_portalAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_WAVE_COUNT,pInstance->GetData(DATA_WAVE_COUNT)+1); diff --git a/src/scripts/northrend/zuldrak.cpp b/src/scripts/northrend/zuldrak.cpp index ceaac1a864a..845d1ae0c24 100644 --- a/src/scripts/northrend/zuldrak.cpp +++ b/src/scripts/northrend/zuldrak.cpp @@ -127,9 +127,9 @@ struct npc_captured_rageclawAI : public ScriptedAI DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P } - void MoveInLineOfSight(Unit *who){} + void MoveInLineOfSight(Unit * /*who*/){} - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) { if (pSpell->Id == SPELL_FREE_RAGECLAW) { @@ -200,7 +200,7 @@ bool GossipHello_npc_gymer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_gymer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_gymer(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -393,7 +393,7 @@ struct npc_gurgthockAI : public ScriptedAI SummonList.push_back(pSummon->GetGUID()); } - void SummonedCreatureDespawn(Creature* pSummon) + void SummonedCreatureDespawn(Creature* /*pSummon*/) { if (bEventInProgress) bEventInProgress = false; @@ -402,7 +402,7 @@ struct npc_gurgthockAI : public ScriptedAI } }; -bool QuestAccept_npc_gurgthock(Player* pPlayer, Creature* pCreature, Quest const* pQuest) +bool QuestAccept_npc_gurgthock(Player* /*pPlayer*/, Creature* pCreature, Quest const* pQuest) { switch (pQuest->GetQuestId()) { @@ -486,7 +486,7 @@ struct npc_orinoko_tuskbreakerAI : public ScriptedAI pAI->RemoveSummons(); } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -628,7 +628,7 @@ struct npc_korrak_bloodragerAI : public npc_escortAI } } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoCast(me, SPELL_GROW); } @@ -711,7 +711,7 @@ struct npc_yggdrasAI : public ScriptedAI pAI->RemoveSummons(); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoCast(me, SPELL_GROW); } @@ -890,7 +890,7 @@ struct npc_released_offspring_harkoaAI : public ScriptedAI me->GetMotionMaster()->MovePoint(0, x, y, z); } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 /*uiId*/) { if (uiType != POINT_MOTION_TYPE) return; @@ -994,7 +994,7 @@ bool GossipHello_npc_crusade_recruit(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_crusade_recruit(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_crusade_recruit(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF +1) { diff --git a/src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp index e46d14fb3f9..bfde95ffcb0 100644 --- a/src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp +++ b/src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp @@ -51,7 +51,7 @@ struct mob_stolen_soulAI : public ScriptedAI Class_Timer = 1000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } void SetMyClass(uint8 myclass) @@ -183,7 +183,7 @@ struct boss_exarch_maladaarAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); } @@ -206,7 +206,7 @@ struct boss_exarch_maladaarAI : public ScriptedAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (rand()%2) return; @@ -214,7 +214,7 @@ struct boss_exarch_maladaarAI : public ScriptedAI DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); //When Exarch Maladar is defeated D'ore appear. @@ -302,7 +302,7 @@ struct mob_avatar_of_martyredAI : public ScriptedAI Mortal_Strike_timer = 10000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index 38cc2d63375..c13e2905171 100644 --- a/src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -60,7 +60,7 @@ struct boss_shirrak_the_dead_watcherAI : public ScriptedAI FocusedTargetGUID = 0; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } void JustSummoned(Creature *summoned) @@ -166,7 +166,7 @@ struct mob_focus_fireAI : public ScriptedAI fiery1 = fiery2 = true; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } void UpdateAI(const uint32 diff) diff --git a/src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp index 5350494fda7..5b15178c33e 100644 --- a/src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ b/src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp @@ -102,7 +102,7 @@ struct boss_nexusprince_shaffarAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); @@ -128,12 +128,12 @@ struct boss_nexusprince_shaffarAI : public ScriptedAI summons.Despawn(summon); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEAD, me); summons.DespawnAll(); @@ -234,7 +234,7 @@ struct mob_ethereal_beaconAI : public ScriptedAI Check_Timer = 1000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { // Send Shaffar to fight Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); diff --git a/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp b/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp index ad841b56cd4..51ec2e83b46 100644 --- a/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp +++ b/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp @@ -56,17 +56,17 @@ struct boss_pandemoniusAI : public ScriptedAI VoidBlast_Counter = 0; } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); } diff --git a/src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp index ff0240c309c..9628fa1a98f 100644 --- a/src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ b/src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp @@ -80,17 +80,17 @@ struct boss_darkweaver_sythAI : public ScriptedAI summon10 = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (rand()%2) return; @@ -207,7 +207,7 @@ struct mob_syth_fireAI : public ScriptedAI flamebuffet_timer = 5000; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void UpdateAI(const uint32 diff) { @@ -255,7 +255,7 @@ struct mob_syth_arcaneAI : public ScriptedAI arcanebuffet_timer = 5000; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void UpdateAI(const uint32 diff) { @@ -303,7 +303,7 @@ struct mob_syth_frostAI : public ScriptedAI frostbuffet_timer = 5000; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void UpdateAI(const uint32 diff) { @@ -351,7 +351,7 @@ struct mob_syth_shadowAI : public ScriptedAI shadowbuffet_timer = 5000; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void UpdateAI(const uint32 diff) { diff --git a/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp index a81a58df8d8..32b97293ca3 100644 --- a/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ b/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp @@ -101,12 +101,12 @@ struct boss_talon_king_ikissAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); @@ -114,7 +114,7 @@ struct boss_talon_king_ikissAI : public ScriptedAI pInstance->SetData(DATA_IKISSDOOREVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } diff --git a/src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp index ef9ae137298..ee27da3cff5 100644 --- a/src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp +++ b/src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp @@ -43,7 +43,7 @@ struct instance_sethekk_halls : public ScriptedInstance m_uiIkissDoorGUID = 0; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { if (pCreature->GetEntry() == NPC_ANZU) { @@ -54,7 +54,7 @@ struct instance_sethekk_halls : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { if (pGo->GetEntry() == IKISS_DOOR) m_uiIkissDoorGUID = pGo->GetGUID(); diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp index 45017a4f3a2..2bb6a717a5a 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp @@ -90,7 +90,7 @@ struct boss_ambassador_hellmawAI : public npc_escortAI npc_escortAI::MoveInLineOfSight(pWho); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 /*i*/) { } @@ -114,17 +114,17 @@ struct boss_ambassador_hellmawAI : public npc_escortAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp index f725c0f2a38..52c60ae0d0e 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp @@ -79,12 +79,12 @@ struct boss_blackheart_the_inciterAI : public ScriptedAI pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -92,7 +92,7 @@ struct boss_blackheart_the_inciterAI : public ScriptedAI pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index 2af5ff130cd..8b63b765b47 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -77,7 +77,7 @@ struct mob_voidtravelerAI : public ScriptedAI sacrificed = false; } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} void UpdateAI(const uint32 diff) { @@ -207,12 +207,12 @@ struct boss_grandmaster_vorpilAI : public ScriptedAI CAST_AI(mob_voidtravelerAI, summoned->AI())->VorpilGUID = me->GetGUID(); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); destroyPortals(); @@ -221,7 +221,7 @@ struct boss_grandmaster_vorpilAI : public ScriptedAI pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); summonPortals(); diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp index ef35e9f01c5..c4fe561a3aa 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp @@ -83,7 +83,7 @@ struct boss_murmurAI : public ScriptedAI } } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } // Sonic Boom instant damage (needs core fix instead of this) void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp index 3cf11d776e7..78340e5e132 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp @@ -68,7 +68,7 @@ struct instance_shadow_labyrinth : public ScriptedInstance return false; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -85,7 +85,7 @@ struct instance_shadow_labyrinth : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/outland/black_temple/black_temple.cpp b/src/scripts/outland/black_temple/black_temple.cpp index cc8256a811c..c1e7f19fbb1 100644 --- a/src/scripts/outland/black_temple/black_temple.cpp +++ b/src/scripts/outland/black_temple/black_temple.cpp @@ -46,7 +46,7 @@ bool GossipHello_npc_spirit_of_olum(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/scripts/outland/black_temple/boss_bloodboil.cpp b/src/scripts/outland/black_temple/boss_bloodboil.cpp index 835f0b5dd29..bf948a81e2d 100644 --- a/src/scripts/outland/black_temple/boss_bloodboil.cpp +++ b/src/scripts/outland/black_temple/boss_bloodboil.cpp @@ -105,7 +105,7 @@ struct boss_gurtogg_bloodboilAI : public ScriptedAI me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoZoneInCombat(); DoScriptText(SAY_AGGRO, me); @@ -113,12 +113,12 @@ struct boss_gurtogg_bloodboilAI : public ScriptedAI pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, IN_PROGRESS); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance) pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE); diff --git a/src/scripts/outland/black_temple/boss_illidan.cpp b/src/scripts/outland/black_temple/boss_illidan.cpp index 4a61253496b..b8e09c0e08e 100644 --- a/src/scripts/outland/black_temple/boss_illidan.cpp +++ b/src/scripts/outland/black_temple/boss_illidan.cpp @@ -415,7 +415,7 @@ struct boss_illidan_stormrageAI : public ScriptedAI Summons.Despawn(summon); } - void MovementInform(uint32 MovementType, uint32 Data) + void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) { if (FlightCount == 7) //change hover point { @@ -430,7 +430,7 @@ struct boss_illidan_stormrageAI : public ScriptedAI Timer[EVENT_FLIGHT_SEQUENCE] = 1000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { me->setActive(true); DoZoneInCombat(); @@ -447,9 +447,9 @@ struct boss_illidan_stormrageAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit *who) {} + void MoveInLineOfSight(Unit *) {} - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -462,7 +462,7 @@ struct boss_illidan_stormrageAI : public ScriptedAI pInstance->HandleGameObject(pInstance->GetData64(i), true); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim == me) return; // TODO: Find better way to handle emote @@ -487,7 +487,7 @@ struct boss_illidan_stormrageAI : public ScriptedAI done_by->AddThreat(me, -(3*(float)damage)/4); // do not let maiev tank him } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades! { @@ -901,7 +901,7 @@ struct flame_of_azzinothAI : public ScriptedAI GlaiveGUID = 0; } - void EnterCombat(Unit *who) {DoZoneInCombat();} + void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} void ChargeCheck() { @@ -1053,10 +1053,10 @@ struct npc_akama_illidanAI : public ScriptedAI me->CombatStop(true); } - void EnterCombat(Unit *who) {} - void MoveInLineOfSight(Unit* who) {} + void EnterCombat(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} - void MovementInform(uint32 MovementType, uint32 Data) + void MovementInform(uint32 MovementType, uint32 /*Data*/) { if (MovementType == POINT_MOTION_TYPE) Timer = 1; @@ -1228,7 +1228,7 @@ struct npc_akama_illidanAI : public ScriptedAI void HandleChannelSequence() { - Unit* Channel, *Spirit[2]; + Unit* Channel = NULL, *Spirit[2]; if (ChannelCount <= 5) { Channel = Unit::GetUnit((*me), ChannelGUID); @@ -1419,8 +1419,8 @@ struct boss_maievAI : public ScriptedAI me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, 45738); } - void EnterCombat(Unit *who) {} - void MoveInLineOfSight(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} + void MoveInLineOfSight(Unit * /*who*/) {} void EnterEvadeMode() {} void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; } @@ -1604,7 +1604,7 @@ struct boss_maievAI : public ScriptedAI } }; -bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event { @@ -1644,7 +1644,7 @@ struct cage_trap_triggerAI : public ScriptedAI me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} void MoveInLineOfSight(Unit *who) { @@ -1704,7 +1704,7 @@ struct shadow_demonAI : public ScriptedAI uint64 TargetGUID; - void EnterCombat(Unit *who) {DoZoneInCombat();} + void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} void Reset() { @@ -1712,13 +1712,13 @@ struct shadow_demonAI : public ScriptedAI DoCast(me, SPELL_SHADOW_DEMON_PASSIVE, true); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (Unit *pTarget = Unit::GetUnit((*me), TargetGUID)) pTarget->RemoveAurasDueToSpell(SPELL_PARALYZE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -1760,7 +1760,7 @@ struct mob_parasitic_shadowfiendAI : public ScriptedAI DoCast(me, SPELL_SHADOWFIEND_PASSIVE, true); } - void EnterCombat(Unit* who) { DoZoneInCombat(); } + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } void DoMeleeAttackIfReady() { @@ -1811,7 +1811,7 @@ struct blade_of_azzinothAI : public NullCreatureAI { blade_of_azzinothAI(Creature* c) : NullCreatureAI(c) {} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE) me->SetDisplayId(21431);//appear when hit by Illidan's glaive diff --git a/src/scripts/outland/black_temple/boss_mother_shahraz.cpp b/src/scripts/outland/black_temple/boss_mother_shahraz.cpp index 5a0fcc0c1da..5949fc46511 100644 --- a/src/scripts/outland/black_temple/boss_mother_shahraz.cpp +++ b/src/scripts/outland/black_temple/boss_mother_shahraz.cpp @@ -123,7 +123,7 @@ struct boss_shahrazAI : public ScriptedAI Enraged = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS); @@ -132,12 +132,12 @@ struct boss_shahrazAI : public ScriptedAI DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance) pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE); diff --git a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp index 7f7e5df19fa..75dd799458c 100644 --- a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp +++ b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp @@ -107,7 +107,7 @@ struct npc_enslaved_soulAI : public ScriptedAI void Reset() {ReliquaryGUID = 0;} - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { DoCast(me, ENSLAVED_SOUL_PASSIVE, true); DoZoneInCombat(); @@ -202,7 +202,7 @@ struct boss_reliquary_of_soulsAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_RELIQUARYOFSOULSEVENT, DONE); @@ -219,7 +219,7 @@ struct boss_reliquary_of_soulsAI : public ScriptedAI return; } - Creature* Essence; + Creature* Essence = NULL; if (EssenceGUID) { Essence = Unit::GetCreature(*me, EssenceGUID); @@ -355,7 +355,7 @@ struct boss_essence_of_sufferingAI : public ScriptedAI AuraTimer = 5000; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) { @@ -366,7 +366,7 @@ struct boss_essence_of_sufferingAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { @@ -379,7 +379,7 @@ struct boss_essence_of_sufferingAI : public ScriptedAI else return; } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SUFF_SAY_SLAY1,SUFF_SAY_SLAY2,SUFF_SAY_SLAY3), me); } @@ -479,7 +479,7 @@ struct boss_essence_of_desireAI : public ScriptedAI } } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL)) for (uint8 i = 0; i < 3; ++i) @@ -489,14 +489,14 @@ struct boss_essence_of_desireAI : public ScriptedAI me->InterruptSpell(CURRENT_GENERIC_SPELL, false); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(DESI_SAY_FREED, me); DoZoneInCombat(); DoCast(me, AURA_OF_DESIRE, true); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(DESI_SAY_SLAY1,DESI_SAY_SLAY2,DESI_SAY_SLAY3), me); } @@ -563,7 +563,7 @@ struct boss_essence_of_angerAI : public ScriptedAI CheckedAggro = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(ANGER_SAY_FREED,ANGER_SAY_FREED2), me); @@ -571,12 +571,12 @@ struct boss_essence_of_angerAI : public ScriptedAI DoCast(me, AURA_OF_ANGER, true); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(ANGER_SAY_DEATH, me); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(ANGER_SAY_SLAY1,ANGER_SAY_SLAY2), me); } @@ -625,7 +625,7 @@ struct boss_essence_of_angerAI : public ScriptedAI } }; -void npc_enslaved_soulAI::JustDied(Unit *killer) +void npc_enslaved_soulAI::JustDied(Unit * /*killer*/) { if (ReliquaryGUID) if (Creature *Reliquary = (Unit::GetCreature((*me), ReliquaryGUID))) diff --git a/src/scripts/outland/black_temple/boss_shade_of_akama.cpp b/src/scripts/outland/black_temple/boss_shade_of_akama.cpp index beb06b23c6f..94f88d5715c 100644 --- a/src/scripts/outland/black_temple/boss_shade_of_akama.cpp +++ b/src/scripts/outland/black_temple/boss_shade_of_akama.cpp @@ -112,11 +112,11 @@ struct mob_ashtongue_channelerAI : public ScriptedAI uint64 ShadeGUID; void Reset() {} - void JustDied(Unit* killer); - void EnterCombat(Unit* who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) {} + void JustDied(Unit* /*killer*/); + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) {} }; struct mob_ashtongue_sorcererAI : public ScriptedAI @@ -133,10 +133,10 @@ struct mob_ashtongue_sorcererAI : public ScriptedAI CheckTimer = 5000; } - void JustDied(Unit* killer); - void EnterCombat(Unit* who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} + void JustDied(Unit* /*killer*/); + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { if (StartBanishing) @@ -236,7 +236,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI reseting = false; } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { summons.DespawnAll(); } @@ -251,7 +251,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI summons.Despawn(summon); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit * /*who*/) { if (!GridSearcherSucceeded) { @@ -480,7 +480,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI } }; -void mob_ashtongue_channelerAI::JustDied(Unit* killer) +void mob_ashtongue_channelerAI::JustDied(Unit* /*killer*/) { Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); if (Shade && Shade->isAlive()) @@ -488,7 +488,7 @@ void mob_ashtongue_channelerAI::JustDied(Unit* killer) else error_log("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama."); } -void mob_ashtongue_sorcererAI::JustDied(Unit* killer) +void mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/) { Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); if (Shade && Shade->isAlive()) @@ -563,7 +563,7 @@ struct npc_akamaAI : public ScriptedAI summons.Despawn(summon); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void BeginEvent(Player* pl) { @@ -613,7 +613,7 @@ struct npc_akamaAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); EventBegun = false; @@ -821,7 +821,7 @@ CreatureAI* GetAI_npc_akama_shade(Creature* pCreature) return new npc_akamaAI (pCreature); } -bool GossipSelect_npc_akama(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_akama(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { diff --git a/src/scripts/outland/black_temple/boss_supremus.cpp b/src/scripts/outland/black_temple/boss_supremus.cpp index 0722992f252..bc1ea3ec673 100644 --- a/src/scripts/outland/black_temple/boss_supremus.cpp +++ b/src/scripts/outland/black_temple/boss_supremus.cpp @@ -95,7 +95,7 @@ struct boss_supremusAI : public ScriptedAI summons.DespawnAll(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_SUPREMUSEVENT, IN_PROGRESS); @@ -131,7 +131,7 @@ struct boss_supremusAI : public ScriptedAI events.ScheduleEvent(EVENT_SWITCH_PHASE, 60000, GCD_CAST); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) { @@ -239,11 +239,11 @@ struct npc_volcanoAI : public Scripted_NoMovementAI } uint32 wait; - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit *who) {} + void MoveInLineOfSight(Unit * /*who*/) {} - void DoAction(const uint32 info) + void DoAction(const uint32 /*info*/) { me->RemoveAura(SPELL_VOLCANIC_ERUPTION); } diff --git a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp index 1fe2a2084c5..a61735f0a25 100644 --- a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp +++ b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp @@ -64,9 +64,9 @@ struct mob_doom_blossomAI : public ScriptedAI TeronGUID = 0; } - void EnterCombat(Unit *who) { } - void AttackStart(Unit* who) { } - void MoveInLineOfSight(Unit* who) { } + void EnterCombat(Unit * /*who*/) { } + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void Despawn() { @@ -122,7 +122,7 @@ struct mob_shadowy_constructAI : public ScriptedAI CheckTeronTimer = 5000; } - void EnterCombat(Unit* who) { } + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { @@ -227,7 +227,7 @@ struct boss_teron_gorefiendAI : public ScriptedAI Done = false; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void MoveInLineOfSight(Unit* pWho) { @@ -250,12 +250,12 @@ struct boss_teron_gorefiendAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(pWho); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance) pInstance->SetData(DATA_TERONGOREFIENDEVENT, DONE); diff --git a/src/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/scripts/outland/black_temple/boss_warlord_najentus.cpp index b33b766e2a1..7d94b4b36a0 100644 --- a/src/scripts/outland/black_temple/boss_warlord_najentus.cpp +++ b/src/scripts/outland/black_temple/boss_warlord_najentus.cpp @@ -80,13 +80,13 @@ struct boss_najentusAI : public ScriptedAI pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, NOT_STARTED); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(rand()%2 ? SAY_SLAY1 : SAY_SLAY2, me); events.DelayEvents(5000, GCD_YELL); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance) pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE); @@ -94,7 +94,7 @@ struct boss_najentusAI : public ScriptedAI DoScriptText(SAY_DEATH, me); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD)) { @@ -104,7 +104,7 @@ struct boss_najentusAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS); diff --git a/src/scripts/outland/black_temple/illidari_council.cpp b/src/scripts/outland/black_temple/illidari_council.cpp index faa18048e3e..cb3ac18be70 100644 --- a/src/scripts/outland/black_temple/illidari_council.cpp +++ b/src/scripts/outland/black_temple/illidari_council.cpp @@ -146,10 +146,10 @@ struct mob_blood_elf_council_voice_triggerAI : public ScriptedAI } else error_log(ERROR_INST_DATA); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -245,9 +245,9 @@ struct mob_illidari_councilAI : public ScriptedAI me->SetDisplayId(11686); } - void EnterCombat(Unit *who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} + void EnterCombat(Unit * /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void StartEvent(Unit *pTarget) { @@ -454,12 +454,12 @@ struct boss_gathios_the_shattererAI : public boss_illidari_councilAI BlessingTimer = 60000; } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_GATH_SLAY, me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_GATH_DEATH, me); } @@ -571,12 +571,12 @@ struct boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI Cooldown = 0; } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_ZERE_SLAY, me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_ZERE_DEATH, me); } @@ -659,12 +659,12 @@ struct boss_lady_malandeAI : public boss_illidari_councilAI ReflectiveShieldTimer = 0; } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_MALA_SLAY, me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_MALA_DEATH, me); } @@ -733,12 +733,12 @@ struct boss_veras_darkshadowAI : public boss_illidari_councilAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(SAY_VERA_SLAY, me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_VERA_DEATH, me); } diff --git a/src/scripts/outland/black_temple/instance_black_temple.cpp b/src/scripts/outland/black_temple/instance_black_temple.cpp index 60179c99f6a..88e25026a13 100644 --- a/src/scripts/outland/black_temple/instance_black_temple.cpp +++ b/src/scripts/outland/black_temple/instance_black_temple.cpp @@ -128,7 +128,7 @@ struct instance_black_temple : public ScriptedInstance return NULL; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -147,7 +147,7 @@ struct instance_black_temple : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/outland/blades_edge_mountains.cpp b/src/scripts/outland/blades_edge_mountains.cpp index 219095b2a07..de7aadc07ec 100644 --- a/src/scripts/outland/blades_edge_mountains.cpp +++ b/src/scripts/outland/blades_edge_mountains.cpp @@ -52,7 +52,7 @@ struct mobs_bladespire_ogreAI : public ScriptedAI void Reset() { } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 /*uiDiff*/) { if (!UpdateVictim()) return; @@ -113,7 +113,7 @@ struct mobs_nether_drakeAI : public ScriptedAI IntangiblePresence_Timer = 15000; } - void EnterCombat(Unit* who) { } + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { @@ -254,7 +254,7 @@ struct npc_daranelleAI : public ScriptedAI void Reset() { } - void EnterCombat(Unit* who) { } + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { @@ -293,7 +293,7 @@ bool GossipHello_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -320,7 +320,7 @@ bool GossipHello_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { diff --git a/src/scripts/outland/boss_doomlord_kazzak.cpp b/src/scripts/outland/boss_doomlord_kazzak.cpp index 8d364b1ec1d..9e9538f2d23 100644 --- a/src/scripts/outland/boss_doomlord_kazzak.cpp +++ b/src/scripts/outland/boss_doomlord_kazzak.cpp @@ -73,7 +73,7 @@ struct boss_doomlordkazzakAI : public ScriptedAI DoScriptText(SAY_INTRO, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me); } @@ -89,7 +89,7 @@ struct boss_doomlordkazzakAI : public ScriptedAI DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); } diff --git a/src/scripts/outland/boss_doomwalker.cpp b/src/scripts/outland/boss_doomwalker.cpp index 0591a3dee90..60bcd7ee373 100644 --- a/src/scripts/outland/boss_doomwalker.cpp +++ b/src/scripts/outland/boss_doomwalker.cpp @@ -74,12 +74,12 @@ struct boss_doomwalkerAI : public ScriptedAI DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp index 1733b174dcc..69a969adda0 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp @@ -187,12 +187,12 @@ struct boss_fathomlord_karathressAI : public ScriptedAI pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -203,7 +203,7 @@ struct boss_fathomlord_karathressAI : public ScriptedAI me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { StartEvent(who); } @@ -266,27 +266,24 @@ struct boss_fathomlord_karathressAI : public ScriptedAI if ((me->GetHealth()*100 / me->GetMaxHealth()) <= 75 && !BlessingOfTides) { BlessingOfTides = true; - bool continueTriggering; + bool continueTriggering = false; Creature* Advisor; for (uint8 i = 0; i < 4; ++i) if (Advisors[i]) { Advisor = (Unit::GetCreature(*me, Advisors[i])); - if (Advisor) + if (Advisor && Advisor->isAlive()) { - if (Advisor->isAlive()) - { - continueTriggering = true; - break; - } + continueTriggering = true; + break; } } - if (continueTriggering) - { - DoCast(me, SPELL_BLESSING_OF_THE_TIDES); - me->MonsterYell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(me, SOUND_GAIN_BLESSING_OF_TIDES); - } + if (continueTriggering) + { + DoCast(me, SPELL_BLESSING_OF_THE_TIDES); + me->MonsterYell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(me, SOUND_GAIN_BLESSING_OF_TIDES); + } } DoMeleeAttackIfReady(); @@ -333,7 +330,7 @@ struct boss_fathomguard_sharkkisAI : public ScriptedAI pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance) { @@ -346,7 +343,7 @@ struct boss_fathomguard_sharkkisAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (pInstance) { @@ -411,16 +408,15 @@ struct boss_fathomguard_sharkkisAI : public ScriptedAI pet = true; //uint32 spell_id; uint32 pet_id; - switch (urand(0,1)) + if (!urand(0,1)) { - case 0: //spell_id = SPELL_SUMMON_FATHOM_LURKER; pet_id = CREATURE_FATHOM_LURKER; - break; - case 1: + } + else + { //spell_id = SPELL_SUMMON_FATHOM_SPOREBAT; pet_id = CREATURE_FATHOM_SPOREBAT; - break; } //DoCast(me, spell_id, true); Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); @@ -462,7 +458,7 @@ struct boss_fathomguard_tidalvessAI : public ScriptedAI pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance) { @@ -475,7 +471,7 @@ struct boss_fathomguard_tidalvessAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (pInstance) { @@ -577,7 +573,7 @@ struct boss_fathomguard_caribdisAI : public ScriptedAI pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance) { @@ -590,7 +586,7 @@ struct boss_fathomguard_caribdisAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (pInstance) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index 737e18a2366..923fdf55f80 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -154,7 +154,7 @@ struct boss_hydross_the_unstableAI : public ScriptedAI } } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -162,7 +162,7 @@ struct boss_hydross_the_unstableAI : public ScriptedAI pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { if (CorruptedForm) { @@ -195,7 +195,7 @@ struct boss_hydross_the_unstableAI : public ScriptedAI Summons.Despawn(summon); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (CorruptedForm) DoScriptText(SAY_CORRUPT_DEATH, me); @@ -226,7 +226,7 @@ struct boss_hydross_the_unstableAI : public ScriptedAI { if (MarkOfCorruption_Count <= 5) { - uint32 mark_spell; + uint32 mark_spell = 0; switch (MarkOfCorruption_Count) { @@ -293,7 +293,7 @@ struct boss_hydross_the_unstableAI : public ScriptedAI { if (MarkOfHydross_Count <= 5) { - uint32 mark_spell; + uint32 mark_spell = NULL; switch(MarkOfHydross_Count) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 2e66414afa4..2f0485d0e6c 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -214,12 +214,12 @@ struct boss_lady_vashjAI : public ScriptedAI if (TaintedElemental_Timer > 50000) TaintedElemental_Timer = 50000; } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -237,7 +237,7 @@ struct boss_lady_vashjAI : public ScriptedAI pInstance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (pInstance) { @@ -608,9 +608,9 @@ struct mob_enchanted_elementalAI : public ScriptedAI VashjGUID = pInstance->GetData64(DATA_LADYVASHJ); } - void EnterCombat(Unit *who) { return; } + void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit *who){return;} + void MoveInLineOfSight(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -671,7 +671,7 @@ struct mob_tainted_elementalAI : public ScriptedAI Despawn_Timer = 30000; } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { if (pInstance) { @@ -683,7 +683,7 @@ struct mob_tainted_elementalAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { me->AddThreat(who, 0.1f); } @@ -741,12 +741,12 @@ struct mob_toxic_sporebatAI : public ScriptedAI Check_Timer = 1000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit * /*who*/) { } @@ -867,9 +867,9 @@ struct mob_shield_generator_channelAI : public ScriptedAI me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit *who) { return; } + void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit *who) { return; } + void MoveInLineOfSight(Unit * /*who*/) {} void UpdateAI (const uint32 diff) { @@ -895,7 +895,7 @@ struct mob_shield_generator_channelAI : public ScriptedAI } }; -bool ItemUse_item_tainted_core(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) +bool ItemUse_item_tainted_core(Player* pPlayer, Item* /*_Item*/, SpellCastTargets const& targets) { ScriptedInstance *pInstance = pPlayer->GetInstanceData(); diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index 48554d5de53..0df1e2b5653 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -82,7 +82,7 @@ struct mob_inner_demonAI : public ScriptedAI ShadowBolt_Timer = 10000; Link_Timer = 1000; } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { Unit* pUnit = Unit::GetUnit((*me),victimGUID); if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER)) @@ -98,7 +98,7 @@ struct mob_inner_demonAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (!victimGUID) return; } @@ -342,7 +342,7 @@ struct boss_leotheras_the_blindAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -357,7 +357,7 @@ struct boss_leotheras_the_blindAI : public ScriptedAI } } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -371,7 +371,7 @@ struct boss_leotheras_the_blindAI : public ScriptedAI pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (me->HasAura(AURA_BANISH)) return; @@ -486,7 +486,7 @@ struct boss_leotheras_the_blindAI : public ScriptedAI if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != me->getVictim()->GetGUID() && TargetList.size()<5) TargetList.push_back(tempTarget); } - SpellEntry *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER); + //SpellEntry *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER); for (std::vector<Unit *>::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) { if ((*itr) && (*itr)->isAlive()) @@ -575,7 +575,7 @@ struct boss_leotheras_the_blind_demonformAI : public ScriptedAI DoScriptText(SAY_FREE, me); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * victim) { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -583,13 +583,13 @@ struct boss_leotheras_the_blind_demonformAI : public ScriptedAI DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { //invisibility (blizzlike, at the end of the fight he doesn't die, he disappears) DoCast(me, 8149, true); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { StartEvent(); } @@ -650,7 +650,7 @@ struct mob_greyheart_spellbinderAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { me->InterruptNonMeleeSpells(false); if (pInstance) @@ -739,7 +739,7 @@ struct mob_greyheart_spellbinderAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit *killer) {} + void JustDied(Unit * /*killer*/) {} }; CreatureAI* GetAI_boss_leotheras_the_blind(Creature* pCreature) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index 4d661bb2812..b1c0c10bcce 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -134,7 +134,7 @@ struct boss_the_lurker_belowAI : public Scripted_NoMovementAI me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(DATA_THELURKERBELOWEVENT, DONE); @@ -142,7 +142,7 @@ struct boss_the_lurker_belowAI : public Scripted_NoMovementAI Summons.DespawnAll(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (pInstance) pInstance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); @@ -163,7 +163,7 @@ struct boss_the_lurker_belowAI : public Scripted_NoMovementAI } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 /*id*/) { if (type == ROTATE_MOTION_TYPE) me->SetReactState(REACT_AGGRESSIVE); @@ -387,7 +387,7 @@ struct mob_coilfang_ambusherAI : public Scripted_NoMovementAI } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index c2b88822824..14c87aee141 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -144,12 +144,12 @@ struct boss_morogrim_tidewalkerAI : public ScriptedAI pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -157,7 +157,7 @@ struct boss_morogrim_tidewalkerAI : public ScriptedAI pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { PlayerList = &me->GetMap()->GetPlayers(); Playercount = PlayerList->getSize(); @@ -305,7 +305,7 @@ struct mob_water_globuleAI : public ScriptedAI me->setFaction(14); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void MoveInLineOfSight(Unit *who) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp index 9f1263aa5b9..c80afae15c7 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp @@ -45,7 +45,7 @@ EndScriptData */ 5 - Lady Vashj Event */ -bool GOHello_go_bridge_console(Player* pPlayer, GameObject* pGo) +bool GOHello_go_bridge_console(Player* /*pPlayer*/, GameObject* pGo) { ScriptedInstance* pInstance = pGo->GetInstanceData(); @@ -191,7 +191,7 @@ struct instance_serpentshrine_cavern : public ScriptedInstance } else FrenzySpawnTimer -= diff; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -224,7 +224,7 @@ struct instance_serpentshrine_cavern : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp index 7b4f0fac6aa..8e1b438bdc5 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp @@ -64,7 +64,7 @@ struct boss_thespiaAI : public ScriptedAI pInstance->SetData(TYPE_HYDROMANCER_THESPIA, NOT_STARTED); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEAD, me); @@ -72,12 +72,12 @@ struct boss_thespiaAI : public ScriptedAI pInstance->SetData(TYPE_HYDROMANCER_THESPIA, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); @@ -143,7 +143,7 @@ struct mob_coilfang_waterelementalAI : public ScriptedAI WaterBoltVolley_Timer = 3000+rand()%3000; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void UpdateAI(const uint32 diff) { diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp index 2cf5e8e3a85..f2da4058e44 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp @@ -76,7 +76,7 @@ struct boss_mekgineer_steamriggerAI : public ScriptedAI pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, NOT_STARTED); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); @@ -84,12 +84,12 @@ struct boss_mekgineer_steamriggerAI : public ScriptedAI pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); @@ -199,13 +199,12 @@ struct mob_steamrigger_mechanicAI : public ScriptedAI Repair_Timer = 2000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* /*who*/) { //react only if attacked - return; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void UpdateAI(const uint32 diff) { diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp index 6f9a5a4a858..f46956dda81 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp @@ -65,9 +65,9 @@ struct mob_naga_distillerAI : public ScriptedAI } } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } - void StartRageGen(Unit *caster) + void StartRageGen(Unit * /*caster*/) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -78,7 +78,7 @@ struct mob_naga_distillerAI : public ScriptedAI pInstance->SetData(TYPE_DISTILLER,IN_PROGRESS); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (me->GetHealth() <= damage) if (pInstance) @@ -111,7 +111,7 @@ struct boss_warlord_kalithreshAI : public ScriptedAI pInstance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); @@ -119,12 +119,12 @@ struct boss_warlord_kalithreshAI : public ScriptedAI pInstance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { //hack :( if (spell->Id == SPELL_WARLORDS_RAGE_PROC) @@ -133,7 +133,7 @@ struct boss_warlord_kalithreshAI : public ScriptedAI me->RemoveAurasDueToSpell(SPELL_WARLORDS_RAGE_PROC); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp index 7dbdb925a9e..188a23738f5 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp @@ -36,7 +36,7 @@ EndScriptData */ 3 - Warlord Kalithresh Event */ -bool GOHello_go_main_chambers_access_panel(Player* pPlayer, GameObject* pGo) +bool GOHello_go_main_chambers_access_panel(Player* /*pPlayer*/, GameObject* pGo) { ScriptedInstance* pInstance = pGo->GetInstanceData(); @@ -87,7 +87,7 @@ struct instance_steam_vault : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -97,7 +97,7 @@ struct instance_steam_vault : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp index a453b9ca0aa..fcfcc1b1a90 100644 --- a/src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp +++ b/src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp @@ -43,7 +43,7 @@ struct boss_hungarfenAI : public ScriptedAI AcidGeyser_Timer = 10000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } @@ -108,11 +108,11 @@ struct mob_underbog_mushroomAI : public ScriptedAI DoCast(me, SPELL_SPORE_CLOUD, true); } - void MoveInLineOfSight(Unit *who) { return; } + void MoveInLineOfSight(Unit * /*who*/) {} - void AttackStart(Unit* who) { return; } + void AttackStart(Unit* /*who*/) {} - void EnterCombat(Unit* who) { } + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index a970debdaea..3a78660389b 100644 --- a/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -61,7 +61,7 @@ struct boss_the_black_stalkerAI : public ScriptedAI Striders.clear(); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void JustSummoned(Creature *summon) { @@ -76,7 +76,7 @@ struct boss_the_black_stalkerAI : public ScriptedAI } } - void JustDied(Unit *who) + void JustDied(Unit * /*who*/) { for (std::list<uint64>::const_iterator i = Striders.begin(); i != Striders.end(); ++i) if (Creature *strider = Unit::GetCreature(*me, *i)) diff --git a/src/scripts/outland/gruuls_lair/boss_gruul.cpp b/src/scripts/outland/gruuls_lair/boss_gruul.cpp index c0b29be3e94..a07ac910598 100644 --- a/src/scripts/outland/gruuls_lair/boss_gruul.cpp +++ b/src/scripts/outland/gruuls_lair/boss_gruul.cpp @@ -84,7 +84,7 @@ struct boss_gruulAI : public ScriptedAI pInstance->SetData(DATA_GRUULEVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -97,7 +97,7 @@ struct boss_gruulAI : public ScriptedAI DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp index 01367894c3d..482af86225c 100644 --- a/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp @@ -161,7 +161,7 @@ struct boss_high_king_maulgarAI : public ScriptedAI DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); @@ -339,7 +339,7 @@ struct boss_olm_the_summonerAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -433,7 +433,7 @@ struct boss_kiggler_the_crazedAI : public ScriptedAI pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { if (pInstance) { @@ -442,7 +442,7 @@ struct boss_kiggler_the_crazedAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -541,7 +541,7 @@ struct boss_blindeye_the_seerAI : public ScriptedAI pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (pInstance) { @@ -550,7 +550,7 @@ struct boss_blindeye_the_seerAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -639,7 +639,7 @@ struct boss_krosh_firehandAI : public ScriptedAI pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (pInstance) { @@ -648,7 +648,7 @@ struct boss_krosh_firehandAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -705,7 +705,7 @@ struct boss_krosh_firehandAI : public ScriptedAI //BlastWave_Timer if (BlastWave_Timer <= diff) { - Unit *pTarget; + Unit *pTarget = NULL; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); std::vector<Unit *> target_list; for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) @@ -720,7 +720,7 @@ struct boss_krosh_firehandAI : public ScriptedAI pTarget = *(target_list.begin()+rand()%target_list.size()); me->InterruptNonMeleeSpells(false); - DoCast(pTarget, SPELL_BLAST_WAVE); + DoCast(pTarget, SPELL_BLAST_WAVE); BlastWave_Timer = 60000; } else BlastWave_Timer -= diff; } diff --git a/src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp b/src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp index a8cad92feb5..bb790a5d4ea 100644 --- a/src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp +++ b/src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp @@ -70,7 +70,7 @@ struct instance_gruuls_lair : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -82,7 +82,7 @@ struct instance_gruuls_lair : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp index b231069dbd1..d5fb9bdba49 100644 --- a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp +++ b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp @@ -60,7 +60,7 @@ struct boss_broggokAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) @@ -104,7 +104,7 @@ struct boss_broggokAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* who) + void JustDied(Unit* /*who*/) { if (pInstance) { diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 8fbabc21ddb..a44ad9cc3c8 100644 --- a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -98,7 +98,7 @@ struct boss_kelidan_the_breakerAI : public ScriptedAI pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { DoScriptText(SAY_WAKE, me); if (me->IsNonMeleeSpellCasted(false)) @@ -108,7 +108,7 @@ struct boss_kelidan_the_breakerAI : public ScriptedAI pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (rand()%2) return; @@ -172,7 +172,7 @@ struct boss_kelidan_the_breakerAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DIE, me); diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp index 4defbe3182e..45219b6509b 100644 --- a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp +++ b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp @@ -67,7 +67,7 @@ struct boss_the_makerAI : public ScriptedAI pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); @@ -78,12 +78,12 @@ struct boss_the_makerAI : public ScriptedAI pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), false); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DIE, me); diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp index d4f051d31f2..3a2eb8ba5ee 100644 --- a/src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp +++ b/src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp @@ -155,7 +155,7 @@ struct instance_blood_furnace : public ScriptedInstance return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 /*type*/, uint32 data) { switch(data) { diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp index 770f8859604..d6c0b2fd401 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp @@ -73,12 +73,12 @@ struct boss_omor_the_unscarredAI : public ScriptedAI CanPullBack = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (rand()%2) return; @@ -96,7 +96,7 @@ struct boss_omor_the_unscarredAI : public ScriptedAI ++SummonedCount; } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DIE, me); } diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp index 4ad5ff31d8f..649f0382468 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp @@ -83,7 +83,7 @@ struct boss_nazanAI : public ScriptedAI UnsummonCheck = 5000; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void JustSummoned(Creature *summoned) { @@ -184,7 +184,7 @@ struct boss_vazrudenAI : public ScriptedAI WipeSaid = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); } @@ -291,7 +291,7 @@ struct boss_vazruden_the_heraldAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (phase == 0) { @@ -392,7 +392,7 @@ struct mob_hellfire_sentryAI : public ScriptedAI KidneyShot_Timer = urand(3000,7000); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* who) { diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp index 5afe596d907..f0e813d3890 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp @@ -61,7 +61,7 @@ struct boss_watchkeeper_gargolmarAI : public ScriptedAI YelledForHeal = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); } @@ -87,12 +87,12 @@ struct boss_watchkeeper_gargolmarAI : public ScriptedAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DIE, me); } diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp index f260987cb9d..29c58675e9c 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp @@ -40,7 +40,7 @@ struct instance_ramparts : public ScriptedInstance m_uiChestHGUID = 0; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index bd8cfc69e5a..5fb381f4065 100644 --- a/src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -128,7 +128,7 @@ struct mob_abyssalAI : public ScriptedAI } } - void EnterCombat(Unit* who) {DoZoneInCombat();} + void EnterCombat(Unit* /*who*/) {DoZoneInCombat();} void AttackStart(Unit *who) {if (!trigger) ScriptedAI::AttackStart(who);} void MoveInLineOfSight(Unit *who) {if (!trigger) ScriptedAI::MoveInLineOfSight(who);} @@ -279,12 +279,12 @@ struct boss_magtheridonAI : public ScriptedAI if (!ClickerNum) NeedCheckCube = false; } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_PLAYER_KILLED, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) pInstance->SetData(DATA_MAGTHERIDON_EVENT, DONE); @@ -292,7 +292,7 @@ struct boss_magtheridonAI : public ScriptedAI DoScriptText(SAY_DEATH, me); } - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void AttackStart(Unit *who) { @@ -300,7 +300,7 @@ struct boss_magtheridonAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); @@ -437,7 +437,7 @@ struct mob_hellfire_channelerAI : public ScriptedAI Check_Timer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); @@ -465,7 +465,7 @@ struct mob_hellfire_channelerAI : public ScriptedAI DoCast(me, SPELL_SOUL_TRANSFER, true); } - void JustDied(Unit* who) + void JustDied(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_CHANNELER_EVENT, DONE); diff --git a/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index cb072c1d74b..d5b459a1fa1 100644 --- a/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -72,7 +72,7 @@ struct instance_magtheridons_lair : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { @@ -85,7 +85,7 @@ struct instance_magtheridons_lair : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index 0c8466b3686..e3ded52edc9 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -189,7 +189,7 @@ struct boss_grand_warlock_nethekurseAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); } @@ -205,12 +205,12 @@ struct boss_grand_warlock_nethekurseAI : public ScriptedAI summoned->CastSpell(summoned,SPELL_CONSUMPTION,false,0,0,me->GetGUID()); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DIE, me); @@ -297,11 +297,11 @@ struct mob_fel_orc_convertAI : public ScriptedAI Hemorrhage_Timer = 3000; } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit * /*who*/) { } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (pInstance) { @@ -321,7 +321,7 @@ struct mob_fel_orc_convertAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -354,9 +354,9 @@ struct mob_lesser_shadow_fissureAI : public ScriptedAI mob_lesser_shadow_fissureAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void MoveInLineOfSight(Unit *who) { } - void AttackStart(Unit* who) { } - void EnterCombat(Unit* who) { } + void MoveInLineOfSight(Unit * /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) {} }; CreatureAI* GetAI_boss_grand_warlock_nethekurse(Creature* pCreature) diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index f8409912717..6fa1c9efe33 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -110,7 +110,7 @@ struct mob_omrogg_headsAI : public ScriptedAI Death_Timer = 4000; DeathYell = false; } - void EnterCombat(Unit* who) { } + void EnterCombat(Unit* /*who*/) {} void DoDeathYell() { @@ -210,7 +210,7 @@ struct boss_warbringer_omroggAI : public ScriptedAI ThreatYell = true; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); @@ -242,7 +242,7 @@ struct boss_warbringer_omroggAI : public ScriptedAI summoned->SetVisibility(VISIBILITY_OFF); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); @@ -268,7 +268,7 @@ struct boss_warbringer_omroggAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index 1626e2450cd..b108077518a 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -88,7 +88,7 @@ struct boss_warchief_kargath_bladefistAI : public ScriptedAI resetcheck_timer = 5000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); } @@ -109,7 +109,7 @@ struct boss_warchief_kargath_bladefistAI : public ScriptedAI } } - void KilledUnit(Unit *victim) + void KilledUnit(Unit* victim) { if (victim->GetTypeId() == TYPEID_PLAYER) { @@ -117,7 +117,7 @@ struct boss_warchief_kargath_bladefistAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); removeAdds(); @@ -240,8 +240,6 @@ struct boss_warchief_kargath_bladefistAI : public ScriptedAI if (Summon_Assistant_Timer <= diff) { - Unit *pTarget = NULL; - for (uint8 i = 0; i < summoned; ++i) { switch (urand(0,2)) diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp index 8dbc56877ca..c29df4d6411 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp @@ -44,7 +44,7 @@ struct instance_shattered_halls : public ScriptedInstance nethekurseDoorGUID = 0; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -52,7 +52,7 @@ struct instance_shattered_halls : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/outland/hellfire_peninsula.cpp b/src/scripts/outland/hellfire_peninsula.cpp index 6d1d9894074..317e045fc1d 100644 --- a/src/scripts/outland/hellfire_peninsula.cpp +++ b/src/scripts/outland/hellfire_peninsula.cpp @@ -189,7 +189,7 @@ CreatureAI* GetAI_npc_ancestral_wolf(Creature* pCreature) ## go_haaleshi_altar ######*/ -bool GOHello_go_haaleshi_altar(Player* pPlayer, GameObject* pGo) +bool GOHello_go_haaleshi_altar(Player* /*pPlayer*/, GameObject* pGo) { pGo->SummonCreature(C_AERANAS,-1321.79, 4043.80, 116.24, 1.25, TEMPSUMMON_TIMED_DESPAWN, 180000); return false; @@ -216,7 +216,7 @@ bool GossipHello_npc_naladu(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_naladu(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_naladu(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_NALADU1, pCreature->GetGUID()); @@ -253,7 +253,7 @@ bool GossipHello_npc_tracy_proudwell(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_tracy_proudwell(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_tracy_proudwell(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -298,7 +298,7 @@ bool GossipHello_npc_trollbane(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_trollbane(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_trollbane(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -374,7 +374,7 @@ struct npc_wounded_blood_elfAI : public npc_escortAI void Reset() { } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { if (HasEscortState(STATE_ESCORT_ESCORTING)) DoScriptText(SAY_ELF_AGGRO, me); diff --git a/src/scripts/outland/nagrand.cpp b/src/scripts/outland/nagrand.cpp index 6c91aa78985..262ec87e4c4 100644 --- a/src/scripts/outland/nagrand.cpp +++ b/src/scripts/outland/nagrand.cpp @@ -51,7 +51,7 @@ struct mob_shattered_rumblerAI : public ScriptedAI Spawn = false; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) { @@ -145,7 +145,7 @@ struct mob_lumpAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (me->HasAura(SPELL_VISUAL_SLEEP)) me->RemoveAura(SPELL_VISUAL_SLEEP); @@ -201,7 +201,7 @@ bool GossipHello_mob_lump(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_mob_lump(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_mob_lump(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -239,9 +239,9 @@ struct mob_sunspring_villagerAI : public ScriptedAI me->SetStandState(UNIT_STAND_STATE_DEAD); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) { if (spell->Id == 32146) { @@ -292,7 +292,7 @@ bool GossipHello_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -337,7 +337,7 @@ bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature, return true; } -bool QuestAccept_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature, Quest const *quest) +bool QuestAccept_npc_altruis_the_sufferer(Player* pPlayer, Creature* /*pCreature*/, Quest const * /*quest*/) { if (!pPlayer->GetQuestRewardStatus(9991)) //Survey the Land, q-id 9991 { @@ -389,7 +389,7 @@ bool GossipHello_npc_greatmother_geyah(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -476,7 +476,7 @@ bool GossipHello_npc_lantresor_of_the_blade(Player* pPlayer, Creature* pCreature return true; } -bool GossipSelect_npc_lantresor_of_the_blade(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_lantresor_of_the_blade(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -564,7 +564,7 @@ struct npc_maghar_captiveAI : public npc_escortAI m_uiFrostShockTimer = 6000; } - void Aggro(Unit* pWho) + void Aggro(Unit* /*pWho*/) { DoCast(me, SPELL_EARTHBIND_TOTEM, false); } @@ -609,7 +609,7 @@ struct npc_maghar_captiveAI : public npc_escortAI } - void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) + void SpellHitTarget(Unit* /*pTarget*/, const SpellEntry* pSpell) { if (pSpell->Id == SPELL_CHAIN_LIGHTNING) { @@ -692,7 +692,7 @@ struct npc_creditmarker_visit_with_ancestorsAI : public ScriptedAI void Reset() {} - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { @@ -751,7 +751,7 @@ struct mob_sparrowhawkAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { diff --git a/src/scripts/outland/netherstorm.cpp b/src/scripts/outland/netherstorm.cpp index c3bc1a49eb5..efe18ad1908 100644 --- a/src/scripts/outland/netherstorm.cpp +++ b/src/scripts/outland/netherstorm.cpp @@ -82,7 +82,7 @@ struct npc_manaforge_control_consoleAI : public ScriptedAI add = NULL; } - void EnterCombat(Unit *who) { return; } + void EnterCombat(Unit * /*who*/) {} /*void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -92,7 +92,7 @@ struct npc_manaforge_control_consoleAI : public ScriptedAI DoSay("Silence! I kill you!",LANG_UNIVERSAL, NULL); }*/ - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { DoScriptText(EMOTE_ABORT, me); @@ -387,7 +387,7 @@ struct npc_commander_dawnforgeAI : public ScriptedAI isEvent = false; } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void JustSummoned(Creature *summoned) { @@ -604,7 +604,7 @@ CreatureAI* GetAI_npc_commander_dawnforge(Creature* pCreature) return new npc_commander_dawnforgeAI(pCreature); } -bool AreaTrigger_at_commander_dawnforge(Player* pPlayer, const AreaTriggerEntry *at) +bool AreaTrigger_at_commander_dawnforge(Player* pPlayer, const AreaTriggerEntry * /*at*/) { //if player lost aura or not have at all, we should not try start event. if (!pPlayer->HasAura(SPELL_SUNFURY_DISGUISE)) @@ -647,7 +647,7 @@ bool GossipHello_npc_professor_dabiri(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_professor_dabiri(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_professor_dabiri(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -715,13 +715,13 @@ struct mob_phase_hunterAI : public ScriptedAI me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * who) { if (who->GetTypeId() == TYPEID_PLAYER) PlayerGUID = who->GetGUID(); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit * /*caster*/, const SpellEntry * /*spell*/) { DoCast(me, SPELL_DE_MATERIALIZE); } @@ -811,7 +811,7 @@ struct npc_bessyAI : public npc_escortAI npc_bessyAI(Creature *c) : npc_escortAI(c) {} - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (Player* pPlayer = GetPlayerForEscort()) pPlayer->FailQuest(Q_ALMABTRIEB); diff --git a/src/scripts/outland/shadowmoon_valley.cpp b/src/scripts/outland/shadowmoon_valley.cpp index 10b5e52d24f..0606dda09b7 100644 --- a/src/scripts/outland/shadowmoon_valley.cpp +++ b/src/scripts/outland/shadowmoon_valley.cpp @@ -391,7 +391,7 @@ bool GossipHello_npc_drake_dealer_hurlunk(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_drake_dealer_hurlunk(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_drake_dealer_hurlunk(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -418,7 +418,7 @@ bool GossipHello_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature* pC return true; } -bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -465,7 +465,7 @@ bool GossipHello_npc_murkblood_overseer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_murkblood_overseer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_murkblood_overseer(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -526,7 +526,7 @@ bool GossipHello_npc_neltharaku(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_neltharaku(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_neltharaku(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -579,7 +579,7 @@ bool GossipHello_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -629,7 +629,7 @@ enum eKarynaku TAXI_PATH_ID = 649 }; -bool QuestAccept_npc_karynaku(Player* pPlayer, Creature* pCreature, Quest const* quest) +bool QuestAccept_npc_karynaku(Player* pPlayer, Creature* /*pCreature*/, Quest const* quest) { if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER) pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID); //pPlayer->ActivateTaxiPathTo(649); @@ -1138,7 +1138,7 @@ struct mob_illidari_spawnAI : public ScriptedAI Timers = false; } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* slayer); void UpdateAI(const uint32 diff) @@ -1251,7 +1251,7 @@ struct mob_torloth_the_magnificentAI : public ScriptedAI me->SetUInt64Value(UNIT_FIELD_TARGET, 0); } - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} void HandleAnimation() { @@ -1407,9 +1407,9 @@ struct npc_lord_illidan_stormrageAI : public ScriptedAI me->SetVisibility(VISIBILITY_OFF); } - void EnterCombat(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void AttackStart(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} void SummonNextWave() { @@ -1573,7 +1573,7 @@ struct npc_lord_illidan_stormrageAI : public ScriptedAI } }; -void mob_illidari_spawnAI::JustDied(Unit *slayer) +void mob_illidari_spawnAI::JustDied(Unit * /*slayer*/) { me->RemoveCorpse(); if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID))) @@ -1585,7 +1585,7 @@ void mob_illidari_spawnAI::JustDied(Unit *slayer) # go_crystal_prison ######*/ -bool GOQuestAccept_GO_crystal_prison(Player* plr, GameObject* go, Quest const* quest) +bool GOQuestAccept_GO_crystal_prison(Player* plr, GameObject* /*go*/, Quest const* quest) { if (quest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH) { @@ -1666,9 +1666,9 @@ struct npc_enraged_spiritAI : public ScriptedAI void Reset() { } - void EnterCombat(Unit *who){} + void EnterCombat(Unit * /*who*/){} - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { // always spawn spirit on death // if totem around diff --git a/src/scripts/outland/shattrath_city.cpp b/src/scripts/outland/shattrath_city.cpp index 86f84dac123..6acc050db48 100644 --- a/src/scripts/outland/shattrath_city.cpp +++ b/src/scripts/outland/shattrath_city.cpp @@ -93,7 +93,7 @@ bool GossipHello_npc_raliq_the_drunk(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_raliq_the_drunk(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_raliq_the_drunk(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -216,7 +216,7 @@ bool GossipHello_npc_shattrathflaskvendors(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_shattrathflaskvendors(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_shattrathflaskvendors(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -240,7 +240,7 @@ bool GossipHello_npc_zephyr(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_zephyr(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_zephyr(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) pPlayer->CastSpell(pPlayer,37778,false); @@ -424,7 +424,7 @@ struct npc_dirty_larryAI : public ScriptedAI } } - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { @@ -510,7 +510,7 @@ bool GossipHello_npc_dirty_larry(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_dirty_larry(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_dirty_larry(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -547,7 +547,7 @@ bool GossipHello_npc_ishanah(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_ishanah(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_ishanah(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) pPlayer->SEND_GOSSIP_MENU(9458, pCreature->GetGUID()); @@ -581,7 +581,7 @@ bool GossipHello_npc_khadgar(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_khadgar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_khadgar(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { diff --git a/src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp b/src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp index 11f475b5b05..69dbc877d89 100644 --- a/src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp @@ -110,16 +110,16 @@ struct npc_millhouse_manastormAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -276,7 +276,7 @@ struct npc_warden_mellicharAI : public ScriptedAI pInstance->SetData(TYPE_HARBINGERSKYRISS,NOT_STARTED); } - void AttackStart(Unit* who) { } + void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { @@ -296,7 +296,7 @@ struct npc_warden_mellicharAI : public ScriptedAI } } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(YELL_INTRO1, me); DoCast(me, SPELL_BUBBLE_VISUAL); @@ -491,7 +491,7 @@ struct mob_zerekethvoidzoneAI : public ScriptedAI DoCast(me, SPELL_VOID_ZONE_DAMAGE); } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} }; CreatureAI* GetAI_mob_zerekethvoidzoneAI(Creature* pCreature) { diff --git a/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp index bd90f525bc0..6576974f3ff 100644 --- a/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp @@ -99,9 +99,9 @@ struct boss_harbinger_skyrissAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); if (pInstance) @@ -268,7 +268,7 @@ struct boss_harbinger_skyriss_illusionAI : public ScriptedAI void Reset() { } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } }; CreatureAI* GetAI_boss_harbinger_skyriss_illusion(Creature* pCreature) diff --git a/src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp index 0a903f6b84f..d16975e2af6 100644 --- a/src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp +++ b/src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp @@ -86,7 +86,7 @@ struct instance_arcatraz : public ScriptedInstance return false; } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) { switch(pGo->GetEntry()) { @@ -102,7 +102,7 @@ struct instance_arcatraz : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { if (pCreature->GetEntry() == MELLICHAR) MellicharGUID = pCreature->GetGUID(); diff --git a/src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp index 96808a2e5cf..1a077036298 100644 --- a/src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp @@ -64,7 +64,7 @@ struct boss_high_botanist_freywinnAI : public ScriptedAI MoveFree = true; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -86,12 +86,12 @@ struct boss_high_botanist_freywinnAI : public ScriptedAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); } diff --git a/src/scripts/outland/tempest_keep/botanica/boss_laj.cpp b/src/scripts/outland/tempest_keep/botanica/boss_laj.cpp index fa1cc2fe602..cbf21c2f992 100644 --- a/src/scripts/outland/tempest_keep/botanica/boss_laj.cpp +++ b/src/scripts/outland/tempest_keep/botanica/boss_laj.cpp @@ -140,7 +140,7 @@ struct boss_lajAI : public ScriptedAI CanSummon = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp b/src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp index 573fc466300..48eb03c16d3 100644 --- a/src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp +++ b/src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp @@ -44,9 +44,9 @@ struct mob_treantAI : public ScriptedAI check_Timer = 0; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit* who) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -128,17 +128,17 @@ struct boss_warp_splinterAI : public ScriptedAI me->SetSpeed(MOVE_RUN, 0.7f, true); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); } diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp index cf920ca762f..b26836b42e2 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp @@ -122,7 +122,7 @@ struct boss_alarAI : public ScriptedAI me->setActive(false); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (pInstance) pInstance->SetData(DATA_ALAREVENT, IN_PROGRESS); @@ -132,7 +132,7 @@ struct boss_alarAI : public ScriptedAI me->setActive(true); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { if (pInstance) pInstance->SetData(DATA_ALAREVENT, DONE); @@ -145,7 +145,7 @@ struct boss_alarAI : public ScriptedAI summon->AI()->AttackStart(pTarget); } - void MoveInLineOfSight(Unit *who) {} + void MoveInLineOfSight(Unit * /*who*/) {} void AttackStart(Unit* who) { @@ -155,7 +155,7 @@ struct boss_alarAI : public ScriptedAI ScriptedAI::AttackStart(who); } - void DamageTaken(Unit* pKiller, uint32 &damage) + void DamageTaken(Unit* /*pKiller*/, uint32 &damage) { if (damage >= me->GetHealth() && Phase1) { @@ -187,7 +187,7 @@ struct boss_alarAI : public ScriptedAI } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 /*id*/) { if (type == POINT_MOTION_TYPE) { @@ -439,7 +439,7 @@ struct mob_ember_of_alarAI : public ScriptedAI bool toDie; void Reset() {toDie = false;} - void EnterCombat(Unit *who) {DoZoneInCombat();} + void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} void EnterEvadeMode() {me->setDeathState(JUST_DIED);} void DamageTaken(Unit* pKiller, uint32 &damage) @@ -465,7 +465,7 @@ struct mob_ember_of_alarAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -490,10 +490,10 @@ struct mob_flame_patch_alarAI : public ScriptedAI { mob_flame_patch_alarAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit *who) {} - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) {} + void EnterCombat(Unit * /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) {} }; CreatureAI* GetAI_mob_flame_patch_alar(Creature* pCreature) diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp index d29d58e606f..e9e217a5c62 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp @@ -131,12 +131,12 @@ struct boss_high_astromancer_solarianAI : public ScriptedAI Summons.DespawnAll(); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize); me->SetDisplayId(MODEL_HUMAN); @@ -146,7 +146,7 @@ struct boss_high_astromancer_solarianAI : public ScriptedAI pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); @@ -393,7 +393,7 @@ struct mob_solarium_priestAI : public ScriptedAI aoesilenceTimer = 15000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp index 53ddbddc841..05681fb7539 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp @@ -193,7 +193,7 @@ struct advisorbase_ai : public ScriptedAI ScriptedAI::AttackStart(who); } - void Revive(Unit* Target) + void Revive(Unit* /*Target*/) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); // double health for phase 3 @@ -414,7 +414,7 @@ struct boss_kaelthasAI : public ScriptedAI } } - void Aggro(Unit *who) + void Aggro(Unit * /*who*/) { if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); @@ -439,7 +439,7 @@ struct boss_kaelthasAI : public ScriptedAI void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -995,7 +995,7 @@ struct boss_thaladred_the_darkenerAI : public advisorbase_ai me->AddThreat(who, 5000000.0f); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_THALADRED_DEATH, me); @@ -1067,7 +1067,7 @@ struct boss_lord_sanguinarAI : public advisorbase_ai DoScriptText(SAY_SANGUINAR_AGGRO, me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_SANGUINAR_DEATH, me); @@ -1118,7 +1118,7 @@ struct boss_grand_astromancer_capernianAI : public advisorbase_ai advisorbase_ai::Reset(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_CAPERNIAN_DEATH, me); @@ -1235,7 +1235,7 @@ struct boss_master_engineer_telonicusAI : public advisorbase_ai advisorbase_ai::Reset(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* /*pKiller*/) { if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_TELONICUS_DEATH, me); @@ -1303,9 +1303,9 @@ struct mob_kael_flamestrikeAI : public Scripted_NoMovementAI me->setFaction(14); } - void MoveInLineOfSight(Unit *who) {} + void MoveInLineOfSight(Unit * /*who*/) {} - void EnterCombat(Unit *who) {return;} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -1343,7 +1343,7 @@ struct mob_phoenix_tkAI : public ScriptedAI DoCast(me, SPELL_BURN, true); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { //is this spell in use anylonger? //DoCast(me, SPELL_EMBER_BLAST, true); @@ -1381,7 +1381,7 @@ struct mob_phoenix_egg_tkAI : public ScriptedAI } //ignore any - void MoveInLineOfSight(Unit* who) { return; } + void MoveInLineOfSight(Unit* /*who*/) {} void AttackStart(Unit* who) { diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp index b8523e2d1df..e1b60b20948 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp @@ -69,12 +69,12 @@ struct boss_void_reaverAI : public ScriptedAI pInstance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); } - void KilledUnit(Unit *victim) + void KilledUnit(Unit * /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); } - void JustDied(Unit *victim) + void JustDied(Unit * /*victim*/) { DoScriptText(SAY_DEATH, me); DoZoneInCombat(); @@ -83,7 +83,7 @@ struct boss_void_reaverAI : public ScriptedAI pInstance->SetData(DATA_VOIDREAVEREVENT, DONE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); diff --git a/src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp b/src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp index 31e6411f77d..59c72071238 100644 --- a/src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp @@ -74,7 +74,7 @@ struct instance_the_eye : public ScriptedInstance return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* pCreature, bool /*add*/) { switch(pCreature->GetEntry()) { diff --git a/src/scripts/outland/tempest_keep/the_eye/the_eye.cpp b/src/scripts/outland/tempest_keep/the_eye/the_eye.cpp index 8a7e1531960..97021fdc031 100644 --- a/src/scripts/outland/tempest_keep/the_eye/the_eye.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/the_eye.cpp @@ -44,7 +44,7 @@ struct mob_crystalcore_devastatorAI : public ScriptedAI Knockaway_Timer = 25000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index 266511bcd46..50c3a6171ce 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -57,12 +57,12 @@ struct boss_gatewatcher_iron_handAI : public ScriptedAI Stream_of_Machine_Fluid_Timer = 55000; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO_1, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { if (rand()%2) return; @@ -70,7 +70,7 @@ struct boss_gatewatcher_iron_handAI : public ScriptedAI DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH_1, me); //TODO: Add door check/open code diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index 730618aff90..ededec0196d 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -68,7 +68,7 @@ struct boss_nethermancer_sepethreaAI : public ScriptedAI pInstance->SetData(DATA_NETHERMANCER_EVENT, NOT_STARTED); } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { if (pInstance) pInstance->SetData(DATA_NETHERMANCER_EVENT, IN_PROGRESS); @@ -78,12 +78,12 @@ struct boss_nethermancer_sepethreaAI : public ScriptedAI DoScriptText(SAY_SUMMON, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); @@ -177,7 +177,7 @@ struct mob_ragin_flamesAI : public ScriptedAI me->SetSpeed(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f)); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp index 29085d25bb0..c0c06704db7 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp @@ -78,17 +78,17 @@ struct boss_pathaleon_the_calculatorAI : public ScriptedAI Counter = 0; summons.DespawnAll(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void JustDied(Unit* Killer) + void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); @@ -184,7 +184,7 @@ struct mob_nether_wraithAI : public ScriptedAI } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp index 608778371a9..c70da24ea3f 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp @@ -56,7 +56,7 @@ struct instance_mechanar : public ScriptedInstance return false; } - uint64 GetData64 (uint32 identifier) + uint64 GetData64 (uint32 /*identifier*/) { return 0; } diff --git a/src/scripts/outland/terokkar_forest.cpp b/src/scripts/outland/terokkar_forest.cpp index 4567986bca0..f95af2a5a30 100644 --- a/src/scripts/outland/terokkar_forest.cpp +++ b/src/scripts/outland/terokkar_forest.cpp @@ -64,7 +64,7 @@ struct mob_unkor_the_ruthlessAI : public ScriptedAI me->setFaction(FACTION_HOSTILE); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void DoNice() { @@ -152,7 +152,7 @@ struct mob_infested_root_walkerAI : public ScriptedAI mob_infested_root_walkerAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void DamageTaken(Unit *done_by, uint32 &damage) { @@ -190,7 +190,7 @@ public: } } - void EnterCombat(Unit* who) {} + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { @@ -232,7 +232,7 @@ struct mob_rotting_forest_ragerAI : public ScriptedAI mob_rotting_forest_ragerAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void EnterCombat(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } void DamageTaken(Unit *done_by, uint32 &damage) { @@ -264,8 +264,8 @@ struct mob_netherweb_victimAI : public ScriptedAI mob_netherweb_victimAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void EnterCombat(Unit *who) { } - void MoveInLineOfSight(Unit *who) { } + void EnterCombat(Unit * /*who*/) { } + void MoveInLineOfSight(Unit * /*who*/) { } void JustDied(Unit* Killer) { @@ -333,7 +333,7 @@ struct npc_floonAI : public ScriptedAI me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -376,7 +376,7 @@ bool GossipHello_npc_floon(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_floon(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_floon(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -450,7 +450,7 @@ struct npc_isla_starmaneAI : public npc_escortAI me->RestoreFaction(); } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { if (Player* pPlayer = GetPlayerForEscort()) { @@ -499,7 +499,7 @@ bool GossipHello_go_skull_pile(Player* pPlayer, GameObject* pGo) return true; } -void SendActionMenu_go_skull_pile(Player* pPlayer, GameObject* pGo, uint32 uiAction) +void SendActionMenu_go_skull_pile(Player* pPlayer, GameObject* /*pGo*/, uint32 uiAction) { switch(uiAction) { @@ -549,7 +549,7 @@ bool GossipHello_npc_slim(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_slim(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_slim(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); diff --git a/src/scripts/outland/zangarmarsh.cpp b/src/scripts/outland/zangarmarsh.cpp index 5d8c30b45fe..5a07165595b 100644 --- a/src/scripts/outland/zangarmarsh.cpp +++ b/src/scripts/outland/zangarmarsh.cpp @@ -57,7 +57,7 @@ bool GossipHello_npcs_ashyen_and_keleth(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npcs_ashyen_and_keleth(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npcs_ashyen_and_keleth(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -146,7 +146,7 @@ struct npc_cooshcooshAI : public ScriptedAI me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -177,7 +177,7 @@ bool GossipHello_npc_cooshcoosh(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_cooshcoosh(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_cooshcoosh(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF) { @@ -206,7 +206,7 @@ bool GossipHello_npc_elder_kuruti(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch (uiAction) { @@ -252,7 +252,7 @@ bool GossipHello_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) { @@ -361,7 +361,7 @@ bool GossipHello_npc_timothy_daniels(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_timothy_daniels(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_timothy_daniels(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { diff --git a/src/scripts/world/areatrigger_scripts.cpp b/src/scripts/world/areatrigger_scripts.cpp index 96bdbbeb315..87253e8c181 100644 --- a/src/scripts/world/areatrigger_scripts.cpp +++ b/src/scripts/world/areatrigger_scripts.cpp @@ -74,7 +74,7 @@ enum eCoilfangGOs GO_COILFANG_WATERFALL = 184212 }; -bool AreaTrigger_at_coilfang_waterfall(Player *pPlayer, const AreaTriggerEntry *pAt) +bool AreaTrigger_at_coilfang_waterfall(Player *pPlayer, const AreaTriggerEntry * /*pAt*/) { if (GameObject* pGo = GetClosestGameObjectWithEntry(pPlayer, GO_COILFANG_WATERFALL, 35.0f)) if (pGo->getLootState() == GO_READY) @@ -96,7 +96,7 @@ enum eLegionTeleporter QUEST_GAINING_ACCESS_H = 10604 }; -bool AreaTrigger_at_legion_teleporter(Player *pPlayer, const AreaTriggerEntry *pAt) +bool AreaTrigger_at_legion_teleporter(Player *pPlayer, const AreaTriggerEntry * /*pAt*/) { if (pPlayer->isAlive() && !pPlayer->isInCombat()) { @@ -123,7 +123,7 @@ enum eRavenholdt NPC_RAVENHOLDT = 13936 }; -bool AreaTrigger_at_ravenholdt(Player* pPlayer, const AreaTriggerEntry* pAt) +bool AreaTrigger_at_ravenholdt(Player* pPlayer, const AreaTriggerEntry* /*pAt*/) { if (pPlayer->GetQuestStatus(QUEST_MANOR_RAVENHOLDT) == QUEST_STATUS_INCOMPLETE) pPlayer->KilledMonsterCredit(NPC_RAVENHOLDT, 0); @@ -173,7 +173,7 @@ enum eStormwrightShelf SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST = 53067 }; -bool AreaTrigger_at_stormwright_shelf(Player* pPlayer, const AreaTriggerEntry* pAt) +bool AreaTrigger_at_stormwright_shelf(Player* pPlayer, const AreaTriggerEntry* /*pAt*/) { if (!pPlayer->isDead() && pPlayer->GetQuestStatus(QUEST_STRENGTH_OF_THE_TEMPEST) == QUEST_STATUS_INCOMPLETE) pPlayer->CastSpell(pPlayer, SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST, false); diff --git a/src/scripts/world/boss_emeriss.cpp b/src/scripts/world/boss_emeriss.cpp index 0dcb30bd55d..3dc14969786 100644 --- a/src/scripts/world/boss_emeriss.cpp +++ b/src/scripts/world/boss_emeriss.cpp @@ -57,7 +57,7 @@ struct boss_emerissAI : public ScriptedAI m_uiCorruptionsCasted = 0; } - void Aggro(Unit* pWho) + void Aggro(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/world/boss_taerar.cpp b/src/scripts/world/boss_taerar.cpp index b394e3240c5..079f7b387a8 100644 --- a/src/scripts/world/boss_taerar.cpp +++ b/src/scripts/world/boss_taerar.cpp @@ -79,7 +79,7 @@ struct boss_taerarAI : public ScriptedAI m_bShades = false; } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/world/boss_ysondre.cpp b/src/scripts/world/boss_ysondre.cpp index 9413e1b19d6..50b8f724e68 100644 --- a/src/scripts/world/boss_ysondre.cpp +++ b/src/scripts/world/boss_ysondre.cpp @@ -63,7 +63,7 @@ struct boss_ysondreAI : public ScriptedAI m_uiSummonDruidModifier = 0; } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/scripts/world/go_scripts.cpp b/src/scripts/world/go_scripts.cpp index fb7a1866299..4cc377984ad 100644 --- a/src/scripts/world/go_scripts.cpp +++ b/src/scripts/world/go_scripts.cpp @@ -58,7 +58,7 @@ enum eCatFigurine SPELL_SUMMON_GHOST_SABER = 5968, }; -bool GOHello_go_cat_figurine(Player *pPlayer, GameObject *pGO) +bool GOHello_go_cat_figurine(Player *pPlayer, GameObject * /*pGO*/) { pPlayer->CastSpell(pPlayer,SPELL_SUMMON_GHOST_SABER,true); return false; @@ -114,7 +114,7 @@ bool GOHello_go_western_crystal_pylon(Player *pPlayer, GameObject *pGO) ## go_barov_journal ######*/ -bool GOHello_go_barov_journal(Player *pPlayer, GameObject *pGO) +bool GOHello_go_barov_journal(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086)) { @@ -127,7 +127,7 @@ bool GOHello_go_barov_journal(Player *pPlayer, GameObject *pGO) ## go_field_repair_bot_74A ######*/ -bool GOHello_go_field_repair_bot_74A(Player *pPlayer, GameObject *pGO) +bool GOHello_go_field_repair_bot_74A(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704)) { @@ -158,7 +158,7 @@ bool GOHello_go_gilded_brazier(Player *pPlayer, GameObject *pGO) ## go_orb_of_command ######*/ -bool GOHello_go_orb_of_command(Player *pPlayer, GameObject *pGO) +bool GOHello_go_orb_of_command(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->GetQuestRewardStatus(7761)) pPlayer->CastSpell(pPlayer,23460,true); @@ -170,7 +170,7 @@ bool GOHello_go_orb_of_command(Player *pPlayer, GameObject *pGO) ## go_tablet_of_madness ######*/ -bool GOHello_go_tablet_of_madness(Player *pPlayer, GameObject *pGO) +bool GOHello_go_tablet_of_madness(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266)) { @@ -199,7 +199,7 @@ bool GOHello_go_tablet_of_the_seven(Player *pPlayer, GameObject *pGO) ## go_jump_a_tron ######*/ -bool GOHello_go_jump_a_tron(Player *pPlayer, GameObject *pGO) +bool GOHello_go_jump_a_tron(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) pPlayer->CastSpell(pPlayer,33382,true); @@ -291,7 +291,7 @@ enum eResoniteCask NPC_GOGGEROC = 11920 }; -bool GOHello_go_resonite_cask(Player *pPlayer, GameObject *pGO) +bool GOHello_go_resonite_cask(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); @@ -365,7 +365,7 @@ enum eSouthfury }; -bool GOHello_go_southfury_moonstone(Player *pPlayer, GameObject *pGO) +bool GOHello_go_southfury_moonstone(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); @@ -388,7 +388,7 @@ enum eDalaranCrystal #define GO_TELE_TO_DALARAN_CRYSTAL_FAILED "This teleport crystal cannot be used until the teleport crystal in Dalaran has been used at least once." -bool GOHello_go_tele_to_dalaran_crystal(Player *pPlayer, GameObject *pGO) +bool GOHello_go_tele_to_dalaran_crystal(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) { @@ -404,7 +404,7 @@ bool GOHello_go_tele_to_dalaran_crystal(Player *pPlayer, GameObject *pGO) ## go_tele_to_violet_stand ######*/ -bool GOHello_go_tele_to_violet_stand(Player *pPlayer, GameObject *pGO) +bool GOHello_go_tele_to_violet_stand(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || pPlayer->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; @@ -441,7 +441,7 @@ bool GOHello_go_fel_crystalforge(Player *pPlayer, GameObject *pGO) return true; } -bool GOSelect_go_fel_crystalforge(Player *pPlayer, GameObject *pGO, uint32 uiSender, uint32 uiAction) +bool GOSelect_go_fel_crystalforge(Player *pPlayer, GameObject *pGO, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -474,7 +474,7 @@ enum eBashirCrystalforge SPELL_CREATE_5_FLASK_OF_SORCERER = 40970, }; -bool GOHello_go_bashir_crystalforge(Player *pPlayer, GameObject *pGO) +bool GOHello_go_bashir_crystalforge(Player *pPlayer, GameObject * /*pGO*/) { pPlayer->CastSpell(pPlayer,SPELL_CREATE_1_FLASK_OF_SORCERER,false); return false; @@ -693,7 +693,7 @@ enum eInconspicuousLandmark ITEM_CUERGOS_KEY = 9275, }; -bool GOHello_go_inconspicuous_landmark(Player *pPlayer, GameObject* pGO) +bool GOHello_go_inconspicuous_landmark(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY,1)) return false; @@ -859,7 +859,7 @@ bool GOHello_go_amberpine_outhouse(Player *pPlayer, GameObject *pGO) return true; } -bool GOSelect_go_amberpine_outhouse(Player *pPlayer, GameObject *pGO, uint32 uiSender, uint32 uiAction) +bool GOSelect_go_amberpine_outhouse(Player *pPlayer, GameObject *pGO, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF +1) { diff --git a/src/scripts/world/guards.cpp b/src/scripts/world/guards.cpp index 95aa4a381ba..21314ca432f 100644 --- a/src/scripts/world/guards.cpp +++ b/src/scripts/world/guards.cpp @@ -2541,7 +2541,7 @@ struct guard_shattrath_aldorAI : public guardAI CanTeleport = false; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -2737,7 +2737,7 @@ struct guard_shattrath_scryerAI : public guardAI CanTeleport = false; } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/scripts/world/item_scripts.cpp b/src/scripts/world/item_scripts.cpp index fe5c304dc75..85866c0ed43 100644 --- a/src/scripts/world/item_scripts.cpp +++ b/src/scripts/world/item_scripts.cpp @@ -41,7 +41,7 @@ enum eOnlyForFlight SPELL_ARCANE_CHARGES = 45072 }; -bool ItemUse_item_only_for_flight(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) +bool ItemUse_item_only_for_flight(Player* pPlayer, Item* pItem, SpellCastTargets const& /*targets*/) { uint32 itemId = pItem->GetEntry(); bool disabled = false; @@ -78,7 +78,7 @@ bool ItemUse_item_only_for_flight(Player* pPlayer, Item* pItem, SpellCastTargets //This is just a hack and should be removed from here. //Creature/Item are in fact created before spell are sucessfully casted, without any checks at all to ensure proper/expected behavior. -bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) +bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* /*pItem*/, SpellCastTargets const& /*targets*/) { //if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT && //targets.getGOTarget()->GetGOInfo()->type == GAMEOBJECT_TYPE_SPELL_FOCUS && targets.getGOTarget()->GetEntry() == 181616) @@ -111,7 +111,7 @@ bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* pItem, SpellCastTar # item_nether_wraith_beacon #####*/ -bool ItemUse_item_nether_wraith_beacon(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) +bool ItemUse_item_nether_wraith_beacon(Player* pPlayer, Item* /*pItem*/, SpellCastTargets const& /*targets*/) { if (pPlayer->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE) { @@ -128,7 +128,7 @@ bool ItemUse_item_nether_wraith_beacon(Player* pPlayer, Item* pItem, SpellCastTa # item_flying_machine #####*/ -bool ItemUse_item_flying_machine(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) +bool ItemUse_item_flying_machine(Player* pPlayer, Item* pItem, SpellCastTargets const& /*targets*/) { uint32 itemId = pItem->GetEntry(); if (itemId == 34060) @@ -162,7 +162,7 @@ bool ItemUse_item_gor_dreks_ointment(Player *pPlayer, Item *pItem, SpellCastTarg # item_incendiary_explosives #####*/ -bool ItemUse_item_incendiary_explosives(Player *pPlayer, Item *pItem, SpellCastTargets const &targets) +bool ItemUse_item_incendiary_explosives(Player *pPlayer, Item *pItem, SpellCastTargets const & /*targets*/) { if (pPlayer->FindNearestCreature(26248,15) || pPlayer->FindNearestCreature(26249,15)) return false; @@ -177,7 +177,7 @@ bool ItemUse_item_incendiary_explosives(Player *pPlayer, Item *pItem, SpellCastT # item_mysterious_egg #####*/ -bool ItemExpire_item_mysterious_egg(Player *pPlayer, ItemPrototype const *pItemProto) +bool ItemExpire_item_mysterious_egg(Player *pPlayer, ItemPrototype const * /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg @@ -191,7 +191,7 @@ bool ItemExpire_item_mysterious_egg(Player *pPlayer, ItemPrototype const *pItemP # item_disgusting_jar #####*/ -bool ItemExpire_item_disgusting_jar(Player *pPlayer, ItemPrototype const *pItemProto) +bool ItemExpire_item_disgusting_jar(Player *pPlayer, ItemPrototype const * /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar @@ -205,7 +205,7 @@ bool ItemExpire_item_disgusting_jar(Player *pPlayer, ItemPrototype const *pItemP # item_harvesters_gift #####*/ #define GHOULS 28845 -bool ItemUse_item_harvesters_gift(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) +bool ItemUse_item_harvesters_gift(Player* pPlayer, Item* /*pItem*/, SpellCastTargets const& /*targets*/) { std::list<Creature*> MinionList; pPlayer->GetAllMinionsByEntry(MinionList,GHOULS); @@ -253,7 +253,7 @@ enum ePileFakeFur GO_HIGH_QUALITY_FUR = 187983, NPC_NESINGWARY_TRAPPER = 25835 }; -bool ItemUse_item_pile_fake_furs(Player *pPlayer, Item *pItem, SpellCastTargets const &targets) +bool ItemUse_item_pile_fake_furs(Player *pPlayer, Item * /*pItem*/, SpellCastTargets const & /*targets*/) { GameObject *pGo; if ((pGo = pPlayer->FindNearestGameObject(GO_CARIBOU_TRAP_1, 5.0f)) || @@ -298,7 +298,7 @@ enum ePetrovClusterBombs ZONE_ID_HOWLING = 495 }; -bool ItemUse_item_petrov_cluster_bombs(Player* pPlayer, Item* pItem, const SpellCastTargets &pTargets) +bool ItemUse_item_petrov_cluster_bombs(Player* pPlayer, Item* pItem, const SpellCastTargets & /*pTargets*/) { if (pPlayer->GetZoneId() != ZONE_ID_HOWLING) return false; @@ -348,7 +348,7 @@ enum eHelpThemselves GO_MAMMOTH_TRAP_22 = 188044, }; -bool ItemUse_item_dehta_trap_smasher(Player* pPlayer, Item* pItem, const SpellCastTargets &pTargets) +bool ItemUse_item_dehta_trap_smasher(Player* pPlayer, Item* /*pItem*/, const SpellCastTargets & /*pTargets*/) { Creature* pMammoth; GameObject* pTrap; diff --git a/src/scripts/world/npc_innkeeper.cpp b/src/scripts/world/npc_innkeeper.cpp index b53ba6f92ff..9bda7a53516 100644 --- a/src/scripts/world/npc_innkeeper.cpp +++ b/src/scripts/world/npc_innkeeper.cpp @@ -75,7 +75,7 @@ bool GossipHello_npc_innkeeper(Player *pPlayer, Creature *pCreature) return true; } -bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && IsEventActive(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED)) { diff --git a/src/scripts/world/npc_professions.cpp b/src/scripts/world/npc_professions.cpp index da84a6d842a..ed22225d0d4 100644 --- a/src/scripts/world/npc_professions.cpp +++ b/src/scripts/world/npc_professions.cpp @@ -183,12 +183,12 @@ there is no difference here (except that default text is chosen with `gameobject # formulas to calculate unlearning cost ###*/ -int32 DoLearnCost(Player* pPlayer) //tailor, alchemy +int32 DoLearnCost(Player* /*pPlayer*/) //tailor, alchemy { return 200000; } -int32 DoHighUnlearnCost(Player* pPlayer) //tailor, alchemy +int32 DoHighUnlearnCost(Player* /*pPlayer*/) //tailor, alchemy { return 1500000; } diff --git a/src/scripts/world/npc_taxi.cpp b/src/scripts/world/npc_taxi.cpp index 2bf12941df6..a7710c6049b 100644 --- a/src/scripts/world/npc_taxi.cpp +++ b/src/scripts/world/npc_taxi.cpp @@ -177,7 +177,7 @@ bool GossipHello_npc_taxi(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_taxi(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { case GOSSIP_ACTION_INFO_DEF: diff --git a/src/scripts/world/npcs_special.cpp b/src/scripts/world/npcs_special.cpp index b3b9406ca00..c7c2d4a68ee 100644 --- a/src/scripts/world/npcs_special.cpp +++ b/src/scripts/world/npcs_special.cpp @@ -275,7 +275,7 @@ bool GossipHello_npc_lunaclaw_spirit(Player *pPlayer, Creature *pCreature) return true; } -bool GossipSelect_npc_lunaclaw_spirit(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_lunaclaw_spirit(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -309,7 +309,7 @@ struct npc_chicken_cluckAI : public ScriptedAI me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -356,7 +356,7 @@ CreatureAI* GetAI_npc_chicken_cluck(Creature* pCreature) return new npc_chicken_cluckAI(pCreature); } -bool QuestAccept_npc_chicken_cluck(Player* pPlayer, Creature* pCreature, const Quest *_Quest) +bool QuestAccept_npc_chicken_cluck(Player* /*pPlayer*/, Creature* pCreature, const Quest *_Quest) { if (_Quest->GetQuestId() == QUEST_CLUCK) CAST_AI(npc_chicken_cluckAI, pCreature->AI())->Reset(); @@ -364,7 +364,7 @@ bool QuestAccept_npc_chicken_cluck(Player* pPlayer, Creature* pCreature, const Q return true; } -bool QuestComplete_npc_chicken_cluck(Player* pPlayer, Creature* pCreature, const Quest *_Quest) +bool QuestComplete_npc_chicken_cluck(Player* /*pPlayer*/, Creature* pCreature, const Quest *_Quest) { if (_Quest->GetQuestId() == QUEST_CLUCK) CAST_AI(npc_chicken_cluckAI, pCreature->AI())->Reset(); @@ -415,7 +415,7 @@ struct npc_dancing_flamesAI : public ScriptedAI } } - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} void ReceiveEmote(Player* pPlayer, uint32 emote) { @@ -555,7 +555,7 @@ struct npc_doctorAI : public ScriptedAI void PatientSaved(Creature* soldier, Player* pPlayer, Location* Point); void UpdateAI(const uint32 diff); - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} }; /*##### @@ -602,7 +602,7 @@ struct npc_injured_patientAI : public ScriptedAI } } - void EnterCombat(Unit* who){} + void EnterCombat(Unit* /*who*/){} void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -643,7 +643,7 @@ struct npc_injured_patientAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { //lower HP on every world tick makes it a useful counter, not officlone though if (me->isAlive() && me->GetHealth() > 6) @@ -726,7 +726,7 @@ void npc_doctorAI::PatientDied(Location* Point) Reset(); } -void npc_doctorAI::PatientSaved(Creature* soldier, Player* pPlayer, Location* Point) +void npc_doctorAI::PatientSaved(Creature* /*soldier*/, Player* pPlayer, Location* Point) { if (pPlayer && PlayerGUID == pPlayer->GetGUID()) { @@ -888,7 +888,7 @@ struct npc_garments_of_questsAI : public npc_escortAI me->SetHealth(int(me->GetMaxHealth()*0.7)); } - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void SpellHit(Unit* pCaster, const SpellEntry *Spell) { @@ -1000,7 +1000,7 @@ struct npc_garments_of_questsAI : public npc_escortAI } } - void WaypointReached(uint32 uiPoint) + void WaypointReached(uint32 /*uiPoint*/) { } @@ -1054,11 +1054,11 @@ struct npc_guardianAI : public ScriptedAI me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -1104,7 +1104,7 @@ bool GossipHello_npc_kingdom_of_dalaran_quests(Player* pPlayer, Creature* pCreat return true; } -bool GossipSelect_npc_kingdom_of_dalaran_quests(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_kingdom_of_dalaran_quests(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { @@ -1194,7 +1194,7 @@ bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -1234,7 +1234,7 @@ bool GossipHello_npc_rogue_trainer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { @@ -1434,7 +1434,7 @@ struct npc_steam_tonkAI : public ScriptedAI npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void OnPossess(bool apply) { @@ -1473,9 +1473,9 @@ struct npc_tonk_mineAI : public ScriptedAI ExplosionTimer = 3000; } - void EnterCombat(Unit *who) {} - void AttackStart(Unit *who) {} - void MoveInLineOfSight(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} + void AttackStart(Unit * /*who*/) {} + void MoveInLineOfSight(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { @@ -1573,7 +1573,7 @@ struct npc_snake_trap_serpentsAI : public ScriptedAI bool IsViper; bool Spawn; - void EnterCombat(Unit *who) {} + void EnterCombat(Unit * /*who*/) {} void Reset() { @@ -1688,7 +1688,7 @@ struct mob_mojoAI : public ScriptedAI if (Unit* own = me->GetOwner()) me->GetMotionMaster()->MoveFollow(own,0,0); } - void Aggro(Unit *who){} + void Aggro(Unit * /*who*/){} void UpdateAI(const uint32 diff) { if (me->HasAura(20372)) @@ -1812,7 +1812,7 @@ struct npc_ebon_gargoyleAI : CasterAI } } - void JustDied(Unit *killer) + void JustDied(Unit * /*killer*/) { // Stop Feeding Gargoyle when it dies if (Unit *owner = me->GetOwner()) @@ -1913,13 +1913,13 @@ struct npc_training_dummy : Scripted_NoMovementAI Reset(); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { ResetTimer = 10000; damage = 0; } - void EnterCombat(Unit *who) + void EnterCombat(Unit * /*who*/) { if (m_Entry != 2674 && m_Entry != 2673) return; @@ -1951,7 +1951,7 @@ struct npc_training_dummy : Scripted_NoMovementAI DespawnTimer -= diff; } } - void MoveInLineOfSight(Unit *who){return;} + void MoveInLineOfSight(Unit * /*who*/){return;} }; CreatureAI* GetAI_npc_training_dummy(Creature* pCreature) @@ -1969,7 +1969,7 @@ struct npc_shadowfiendAI : public ScriptedAI { npc_shadowfiendAI(Creature* pCreature) : ScriptedAI(pCreature) {} - void DamageTaken(Unit* pKiller, uint32 &damage) + void DamageTaken(Unit* /*pKiller*/, uint32 &damage) { if (me->isSummon()) if (Unit* pOwner = CAST_SUM(me)->GetSummoner()) @@ -1980,7 +1980,7 @@ struct npc_shadowfiendAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { DoMeleeAttackIfReady(); } @@ -2029,7 +2029,7 @@ bool GossipHello_npc_wormhole(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_wormhole(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_wormhole(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { bool roll = urand(0,1); @@ -2089,7 +2089,7 @@ bool GossipHello_npc_pet_trainer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_pet_trainer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_pet_trainer(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { diff --git a/src/shared/Database/DBCStore.h b/src/shared/Database/DBCStore.h index 23348c62c74..61e2f7a6d06 100644 --- a/src/shared/Database/DBCStore.h +++ b/src/shared/Database/DBCStore.h @@ -46,7 +46,7 @@ struct SqlDbc DBCFileLoader::GetFormatRecordSize(fmt, &indexPos); if (indexPos>=0) { - for (uint32 x=0; x < formatString->size(); x++) + for (int32 x=0; x < formatString->size(); x++) { // Count only fields present in sql if ((*formatString)[x] == FT_SQL_PRESENT) |