josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove LOTS of compile warnings

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-04-19 09:26:37 +02:00
parent fdd8d2f3cc
commit 74dd02d024
549 changed files with 2082 additions and 2122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/AchievementMgr.cpp
-1
View File
@@ -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); 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;
} }
return false;
} }
bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Unit const* target, uint32 miscvalue1 /*= 0*/) const bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Unit const* target, uint32 miscvalue1 /*= 0*/) const
src/game/AuctionHouseBot.cpp
+4 -4
View File
@@ -185,11 +185,11 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
uint32 purpleIcount = config->GetPercents(AHB_PURPLE_I); uint32 purpleIcount = config->GetPercents(AHB_PURPLE_I);
uint32 orangeIcount = config->GetPercents(AHB_ORANGE_I); uint32 orangeIcount = config->GetPercents(AHB_ORANGE_I);
uint32 yellowIcount = config->GetPercents(AHB_YELLOW_I); uint32 yellowIcount = config->GetPercents(AHB_YELLOW_I);
uint32 total = greyTGcount + whiteTGcount + greenTGcount + blueTGcount /* uint32 total = greyTGcount + whiteTGcount + greenTGcount + blueTGcount
+ purpleTGcount + orangeTGcount + yellowTGcount + purpleTGcount + orangeTGcount + yellowTGcount
+ whiteIcount + greenIcount + blueIcount + purpleIcount + whiteIcount + greenIcount + blueIcount + purpleIcount
+ orangeIcount + yellowIcount; + orangeIcount + yellowIcount;
*/
uint32 greyTGoods = config->GetItemCounts(AHB_GREY_TG); uint32 greyTGoods = config->GetItemCounts(AHB_GREY_TG);
uint32 whiteTGoods = config->GetItemCounts(AHB_WHITE_TG); uint32 whiteTGoods = config->GetItemCounts(AHB_WHITE_TG);
uint32 greenTGoods = config->GetItemCounts(AHB_GREEN_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) void AuctionHouseBot::Commands(uint32 command, uint32 ahMapID, uint32 col, char* args)
{ {
AHBConfig *config; AHBConfig *config = NULL;
switch (ahMapID) switch (ahMapID)
{ {
case 2: case 2:
@@ -1751,7 +1751,7 @@ void AuctionHouseBot::LoadValues(AHBConfig *config)
sLog.outString("maxStackOrange = %u", config->GetMaxStack(AHB_ORANGE)); sLog.outString("maxStackOrange = %u", config->GetMaxStack(AHB_ORANGE));
sLog.outString("maxStackYellow = %u", config->GetMaxStack(AHB_YELLOW)); 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()); AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(config->GetAHFID());
config->ResetItemCounts(); config->ResetItemCounts();
src/game/BattleGround.cpp
+3 -3
View File
@@ -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(); Map *map = GetBgMap();
if (!map) 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(); Map * map = GetBgMap();
if (!map) if (!map)
@@ -1901,7 +1901,7 @@ int32 BattleGround::GetObjectType(uint64 guid)
return -1; return -1;
} }
void BattleGround::HandleKillUnit(Creature *creature, Player *killer) void BattleGround::HandleKillUnit(Creature * /*creature*/, Player * /*killer*/)
{ {
} }
src/game/BattleGround.h
+2 -2
View File
@@ -500,8 +500,8 @@ class BattleGround
virtual void EventPlayerCapturedFlag(Player* /*player*/) {} virtual void EventPlayerCapturedFlag(Player* /*player*/) {}
void EventPlayerLoggedIn(Player* player, uint64 plr_guid); void EventPlayerLoggedIn(Player* player, uint64 plr_guid);
void EventPlayerLoggedOut(Player* player); void EventPlayerLoggedOut(Player* player);
virtual void EventPlayerDamagedGO(Player* /*player*/, GameObject* /*target_obj*/, uint32 /*eventId*/) {} virtual void EventPlayerDamagedGO(Player* /*player*/, GameObject* /*target_obj*/, uint32 /*eventId*/) {}
virtual void EventPlayerUsedGO(Player* player, GameObject* go){} virtual void EventPlayerUsedGO(Player* /*player*/, GameObject* /*go*/){}
/* Death related */ /* Death related */
virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player); virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
src/game/BattleGroundAV.cpp
+1 -3
View File
@@ -708,9 +708,7 @@ void BattleGroundAV::PopulateNode(BG_AV_Nodes node)
} }
for (uint8 i=0; i<4; i++) for (uint8 i=0; i<4; i++)
{ AddAVCreature(creatureid,c_place+i);
Creature* cr = AddAVCreature(creatureid,c_place+i);
}
} }
void BattleGroundAV::DePopulateNode(BG_AV_Nodes node) void BattleGroundAV::DePopulateNode(BG_AV_Nodes node)
{ {
src/game/BattleGroundHandler.cpp
+14 -19
View File
@@ -77,7 +77,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data)
uint32 instanceId; uint32 instanceId;
uint8 joinAsGroup; uint8 joinAsGroup;
bool isPremade = false; bool isPremade = false;
Group * grp; Group * grp = NULL;
recv_data >> guid; // battlemaster guid recv_data >> guid; // battlemaster guid
recv_data >> bgTypeId_; // battleground type id (DBC id) recv_data >> bgTypeId_; // battleground type id (DBC id)
@@ -134,6 +134,18 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data)
// check if has free queue slots // check if has free queue slots
if (!_player->HasFreeBattleGroundQueueId()) if (!_player->HasFreeBattleGroundQueueId())
return; 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 else
{ {
@@ -145,13 +157,8 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data)
return; return;
err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, 0, bg->GetMaxPlayersPerTeam(), false, 0); err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, 0, bg->GetMaxPlayersPerTeam(), false, 0);
isPremade = (grp->GetMembersCount() >= bg->GetMinPlayersPerTeam()); 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];
BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
if (joinAsGroup /* && _player->GetGroup()*/)
{
GroupQueueInfo * ginfo; GroupQueueInfo * ginfo;
uint32 avgTime; 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: 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"); 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()); sBattleGroundMgr.ScheduleQueueUpdate(0, 0, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId());
} }
src/game/BattleGroundIC.cpp
+3 -2
View File
@@ -102,7 +102,7 @@ void BattleGroundIC::SpawnLeader(uint32 teamid)
AddCreature(34922, 1, HORDE, 1264.42f, -766.80f, 48.91f, 3.28f, 10*MINUTE); 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) if (GetStatus() != STATUS_IN_PROGRESS)
return; return;
@@ -124,7 +124,8 @@ void BattleGroundIC::EndBattleGround(uint32 winner)
{ {
BattleGround::EndBattleGround(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) if (GetStatus() != STATUS_IN_PROGRESS)
return; return;
src/game/BattleGroundSA.cpp
+2 -2
View File
@@ -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) switch(event)
{ {
@@ -565,7 +565,7 @@ void BattleGroundSA::SendTime()
UpdateWorldState(BG_SA_TIMER_SEC_DECS, ((end_of_round%60000)%10000)/1000); 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()) switch(target_obj->GetEntry())
{ {
src/game/BattleGroundWS.cpp
+1 -1
View File
@@ -443,7 +443,7 @@ void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target
return; return;
int32 message_id = 0; int32 message_id = 0;
ChatMsg type; ChatMsg type = CHAT_MSG_BG_SYSTEM_NEUTRAL;
//alliance flag picked up from base //alliance flag picked up from base
if (Source->GetTeam() == HORDE && this->GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_BASE if (Source->GetTeam() == HORDE && this->GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_BASE
src/game/CalendarHandler.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "Opcodes.h" #include "Opcodes.h"
#include "Player.h" #include "Player.h"
void WorldSession::HandleCalendarGetCalendar(WorldPacket &recv_data) void WorldSession::HandleCalendarGetCalendar(WorldPacket & /*recv_data*/)
{ {
sLog.outDebug("WORLD: CMSG_CALENDAR_GET_CALENDAR"); // empty sLog.outDebug("WORLD: CMSG_CALENDAR_GET_CALENDAR"); // empty
src/game/Channel.cpp
-1
View File
@@ -431,7 +431,6 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
return; return;
} }
PlayerInfo inf = players[newp->GetGUID()];
if (p == m_ownerGUID && newp->GetGUID() == m_ownerGUID && mod) if (p == m_ownerGUID && newp->GetGUID() == m_ownerGUID && mod)
return; return;
src/game/CombatAI.cpp
+10 -10
View File
@@ -39,22 +39,22 @@ void AggressorAI::UpdateAI(const uint32 /*diff*/)
} }
// some day we will delete these useless things // some day we will delete these useless things
int CombatAI::Permissible(const Creature *creature) int CombatAI::Permissible(const Creature * /*creature*/)
{ {
return PERMIT_BASE_NO; return PERMIT_BASE_NO;
} }
int ArchorAI::Permissible(const Creature *creature) int ArchorAI::Permissible(const Creature * /*creature*/)
{ {
return PERMIT_BASE_NO; return PERMIT_BASE_NO;
} }
int TurretAI::Permissible(const Creature *creature) int TurretAI::Permissible(const Creature * /*creature*/)
{ {
return PERMIT_BASE_NO; return PERMIT_BASE_NO;
} }
int AOEAI::Permissible(const Creature *creature) int AOEAI::Permissible(const Creature * /*creature*/)
{ {
return PERMIT_BASE_NO; return PERMIT_BASE_NO;
} }
@@ -204,7 +204,7 @@ void ArchorAI::AttackStart(Unit *who)
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
} }
void ArchorAI::UpdateAI(const uint32 diff) void ArchorAI::UpdateAI(const uint32 /*diff*/)
{ {
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
@@ -229,7 +229,7 @@ TurretAI::TurretAI(Creature *c) : CreatureAI(c)
me->m_SightDistance = me->m_CombatDistance; 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 // TODO: use one function to replace it
if (!me->IsWithinCombatRange(me->getVictim(), me->m_CombatDistance) if (!me->IsWithinCombatRange(me->getVictim(), me->m_CombatDistance)
@@ -244,7 +244,7 @@ void TurretAI::AttackStart(Unit *who)
me->Attack(who, false); me->Attack(who, false);
} }
void TurretAI::UpdateAI(const uint32 diff) void TurretAI::UpdateAI(const uint32 /*diff*/)
{ {
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
@@ -267,16 +267,16 @@ AOEAI::AOEAI(Creature *c) : CreatureAI(c)
me->SetDisplayId(11686);//invisible model,around a size of a player 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; 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])) if (!me->HasAura(me->m_spells[0]))
me->CastSpell(me, me->m_spells[0],false); me->CastSpell(me, me->m_spells[0],false);
src/game/CombatAI.h
+1 -1
View File
@@ -60,7 +60,7 @@ class CasterAI : public CombatAI
void InitializeAI(); void InitializeAI();
void AttackStart(Unit * victim) { AttackStartCaster(victim, m_attackDist); } void AttackStart(Unit * victim) { AttackStartCaster(victim, m_attackDist); }
void UpdateAI(const uint32 diff); void UpdateAI(const uint32 diff);
void EnterCombat(Unit *who); void EnterCombat(Unit * /*who*/);
private: private:
float m_attackDist; float m_attackDist;
}; };
src/game/Creature.cpp
+3 -3
View File
@@ -263,7 +263,7 @@ void Creature::RemoveCorpse()
/** /**
* change the entry of creature until respawn * 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); CreatureInfo const *normalInfo = objmgr.GetCreatureTemplate(Entry);
if (!normalInfo) if (!normalInfo)
@@ -936,7 +936,7 @@ bool Creature::isCanTrainingAndResetTalentsOf(Player* pPlayer) const
&& pPlayer->getClass() == GetCreatureInfo()->trainer_class; && 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(); /* uint32 timeElap = getMSTime();
if ((timeElap - m_startMove) < m_moveTime) if ((timeElap - m_startMove) < m_moveTime)
@@ -1356,7 +1356,7 @@ void Creature::DeleteFromDB()
WorldDatabase.CommitTransaction(); 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 // not in world
if (!IsInWorld() || !u->IsInWorld()) if (!IsInWorld() || !u->IsInWorld())
src/game/CreatureAI.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "Vehicle.h" #include "Vehicle.h"
//Disable CreatureAI when charmed //Disable CreatureAI when charmed
void CreatureAI::OnCharmed(bool apply) void CreatureAI::OnCharmed(bool /*apply*/)
{ {
//me->IsAIEnabled = !apply;*/ //me->IsAIEnabled = !apply;*/
me->NeedChangeAI = true; me->NeedChangeAI = true;
src/game/CreatureAI.h
+7 -7
View File
@@ -100,7 +100,7 @@ class CreatureAI : public UnitAI
// Called at any Damage from any attacker (before damage apply) // Called at any Damage from any attacker (before damage apply)
// Note: it for recalculation damage or special reaction at damage // Note: it for recalculation damage or special reaction at damage
// for attack reaction use AttackedBy called for not DOT damage in Unit::DealDamage also // 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 // Called when the creature is killed
virtual void JustDied(Unit *) {} virtual void JustDied(Unit *) {}
@@ -110,7 +110,7 @@ class CreatureAI : public UnitAI
// Called when the creature summon successfully other creature // Called when the creature summon successfully other creature
virtual void JustSummoned(Creature*) {} virtual void JustSummoned(Creature*) {}
virtual void IsSummonedBy(Unit *summoner) {} virtual void IsSummonedBy(Unit * /*summoner*/) {}
virtual void SummonedCreatureDespawn(Creature* /*unit*/) {} virtual void SummonedCreatureDespawn(Creature* /*unit*/) {}
@@ -118,10 +118,10 @@ class CreatureAI : public UnitAI
virtual void SpellHit(Unit*, const SpellEntry*) {} virtual void SpellHit(Unit*, const SpellEntry*) {}
// Called when spell hits a target // 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 // 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) // Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc)
//virtual void AttackedBy(Unit* attacker); //virtual void AttackedBy(Unit* attacker);
@@ -143,7 +143,7 @@ class CreatureAI : public UnitAI
void DoZoneInCombat(Creature* pUnit = NULL); void DoZoneInCombat(Creature* pUnit = NULL);
// Called at text emote receive from player // 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 ================== /// == Triggered Actions Requested ==================
@@ -152,7 +152,7 @@ class CreatureAI : public UnitAI
//virtual void AttackStart(Unit *) {} //virtual void AttackStart(Unit *) {}
// Called at World update tick // Called at World update tick
//virtual void UpdateAI(const uint32 diff) {} //virtual void UpdateAI(const uint32 /*diff*/) {}
/// == State checks ================================= /// == State checks =================================
@@ -170,7 +170,7 @@ class CreatureAI : public UnitAI
// Pointer to controlled by AI creature // Pointer to controlled by AI creature
//Creature* const me; //Creature* const me;
virtual void PassengerBoarded(Unit *who, int8 seatId, bool apply) {} virtual void PassengerBoarded(Unit * /*who*/, int8 /*seatId*/, bool /*apply*/) {}
protected: protected:
virtual void MoveInLineOfSight(Unit *); virtual void MoveInLineOfSight(Unit *);
src/game/CreatureEventAI.cpp
+1 -1
View File
@@ -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) if (InvinceabilityHpLevel > 0 && me->GetHealth() < InvinceabilityHpLevel+damage)
{ {
src/game/CreatureEventAI.h
+1 -1
View File
@@ -594,7 +594,7 @@ class CreatureEventAI : public CreatureAI
void JustReachedHome(); void JustReachedHome();
void EnterCombat(Unit *enemy); void EnterCombat(Unit *enemy);
void EnterEvadeMode(); void EnterEvadeMode();
void JustDied(Unit* killer); void JustDied(Unit* /*killer*/);
void KilledUnit(Unit* victim); void KilledUnit(Unit* victim);
void JustSummoned(Creature* pUnit); void JustSummoned(Creature* pUnit);
void AttackStart(Unit *who); void AttackStart(Unit *who);
src/game/FleeingMovementGenerator.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ bool FleeingMovementGenerator<Creature>::GetDestination(float &x, float &y, floa
} }
template<> 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; return false;
} }
src/game/GameObject.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ GameObject::~GameObject()
// CleanupsBeforeDelete(); // CleanupsBeforeDelete();
} }
void GameObject::CleanupsBeforeDelete(bool finalCleanup) void GameObject::CleanupsBeforeDelete(bool /*finalCleanup*/)
{ {
if (IsInWorld()) if (IsInWorld())
RemoveFromWorld(); RemoveFromWorld();
src/game/Group.cpp
+1 -1
View File
@@ -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()); BattlemasterListEntry const* bgEntry = sBattlemasterListStore.LookupEntry(bgOrTemplate->GetTypeID());
if (!bgEntry) if (!bgEntry)
src/game/Guild.h
-1
View File
@@ -200,7 +200,6 @@ inline uint32 GetGuildBankTabPrice(uint8 Index)
default: default:
return 0; return 0;
} }
return 0;
} }
struct GuildEventLogEntry struct GuildEventLogEntry
src/game/IdleMovementGenerator.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ DistractMovementGenerator::Finalize(Unit& owner)
} }
bool bool
DistractMovementGenerator::Update(Unit& owner, const uint32& time_diff) DistractMovementGenerator::Update(Unit& /*owner*/, const uint32& time_diff)
{ {
if (time_diff > m_timer) if (time_diff > m_timer)
return false; return false;
src/game/InstanceData.h
+1 -1
View File
@@ -130,7 +130,7 @@ class InstanceData : public ZoneScript
void SaveToDB(); void SaveToDB();
virtual void Update(uint32 diff) {} virtual void Update(uint32 /*diff*/) {}
//Used by the map's CanEnter function. //Used by the map's CanEnter function.
//This is to prevent players from entering during boss encounters. //This is to prevent players from entering during boss encounters.
src/game/InstanceSaveMgr.cpp
+1 -3
View File
@@ -235,7 +235,7 @@ void InstanceSaveManager::_DelHelper(DatabaseType &db, const char *fields, const
va_list ap; va_list ap;
char szQueryTail [MAX_QUERY_LEN]; char szQueryTail [MAX_QUERY_LEN];
va_start(ap, queryTail); va_start(ap, queryTail);
int res = vsnprintf(szQueryTail, MAX_QUERY_LEN, queryTail, ap); vsnprintf(szQueryTail, MAX_QUERY_LEN, queryTail, ap);
va_end(ap); va_end(ap);
QueryResult_AutoPtr result = db.PQuery("SELECT %s FROM %s %s", fields, table, szQueryTail); 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() void InstanceSaveManager::CleanupInstances()
{ {
uint64 now = (uint64)time(NULL);
barGoLink bar(2); barGoLink bar(2);
bar.step(); bar.step();
src/game/LFGHandler.cpp
+2 -2
View File
@@ -258,7 +258,7 @@ void WorldSession::HandleLookingForGroup(WorldPacket& recv_data)
SendLfgUpdate(0, 1, 0); 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; uint32 number = 0;
@@ -428,7 +428,7 @@ void WorldSession::HandleLfgSetRoles(WorldPacket &recv_data)
_player->m_lookingForGroup.roles = roles; _player->m_lookingForGroup.roles = roles;
} }
void WorldSession::SendLfgUpdate(uint8 unk1, uint8 unk2, uint8 unk3) void WorldSession::SendLfgUpdate(uint8 /*unk1*/, uint8 /*unk2*/, uint8 /*unk3*/)
{ {
} }
src/game/Level0.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ bool ChatHandler::HandleHelpCommand(const char* args)
return true; return true;
} }
bool ChatHandler::HandleCommandsCommand(const char* args) bool ChatHandler::HandleCommandsCommand(const char* /*args*/)
{ {
ShowHelpForCommand(getCommandTable(), ""); ShowHelpForCommand(getCommandTable(), "");
return true; return true;
src/game/Level1.cpp
+4 -4
View File
@@ -295,7 +295,7 @@ std::string ChatHandler::PGetParseString(int32 entry, ...)
return (std::string)str; return (std::string)str;
} }
bool ChatHandler::HandleGMTicketListCommand(const char* args) bool ChatHandler::HandleGMTicketListCommand(const char* /*args*/)
{ {
SendSysMessage(LANG_COMMAND_TICKETSHOWLIST); SendSysMessage(LANG_COMMAND_TICKETSHOWLIST);
for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) 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; return true;
} }
bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args) bool ChatHandler::HandleGMTicketListOnlineCommand(const char* /*args*/)
{ {
SendSysMessage(LANG_COMMAND_TICKETSHOWONLINELIST); SendSysMessage(LANG_COMMAND_TICKETSHOWONLINELIST);
for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) 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; return true;
} }
bool ChatHandler::HandleGMTicketListClosedCommand(const char* args) bool ChatHandler::HandleGMTicketListClosedCommand(const char* /*args*/)
{ {
SendSysMessage(LANG_COMMAND_TICKETSHOWCLOSEDLIST); SendSysMessage(LANG_COMMAND_TICKETSHOWCLOSEDLIST);
for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) 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()) 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: // 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) // 1) we are in his group (either as leader or as member)
src/game/Level2.cpp
+5 -7
View File
@@ -1147,7 +1147,7 @@ bool ChatHandler::HandleNpcAddMoveCommand(const char* args)
if (wait < 0) if (wait < 0)
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); //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(); point = (*result)[0].GetUInt32();
Player* player = m_session->GetPlayer(); 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')", 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()); pathid, point+1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ());
@@ -2437,7 +2437,7 @@ bool ChatHandler::HandleReloadAllPaths(const char* args)
return true; return true;
} }
bool ChatHandler::HandleWpUnLoadPathCommand(const char *args) bool ChatHandler::HandleWpUnLoadPathCommand(const char * /*args*/)
{ {
uint32 guidlow = 0; uint32 guidlow = 0;
Creature* target = getSelectedCreature(); Creature* target = getSelectedCreature();
@@ -3425,7 +3425,7 @@ bool ChatHandler::HandleLookupEventCommand(const char* args)
return true; return true;
} }
bool ChatHandler::HandleEventActiveListCommand(const char* args) bool ChatHandler::HandleEventActiveListCommand(const char* /*args*/)
{ {
uint32 counter = 0; uint32 counter = 0;
@@ -3674,8 +3674,6 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args)
if (!Utf8toWStr(args,wnamepart)) if (!Utf8toWStr(args,wnamepart))
return false; return false;
uint32 counter = 0; // Counter for figure out that we found smth.
// converting string that we try to find to lower case // converting string that we try to find to lower case
wstrToLower(wnamepart); wstrToLower(wnamepart);
@@ -3893,7 +3891,7 @@ bool ChatHandler::HandleWaterwalkCommand(const char* args)
return true; return true;
} }
bool ChatHandler::HandleCreatePetCommand(const char* args) bool ChatHandler::HandleCreatePetCommand(const char* /*args*/)
{ {
Player *player = m_session->GetPlayer(); Player *player = m_session->GetPlayer();
Creature *creatureTarget = getSelectedCreature(); Creature *creatureTarget = getSelectedCreature();
src/game/Level3.cpp
+11 -11
View File
@@ -757,7 +757,7 @@ bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*)
return true; return true;
} }
bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char *args) bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char * /*args*/)
{ {
sLog.outString("Loading Linked Respawns... (`creature_linked_respawn`)"); sLog.outString("Loading Linked Respawns... (`creature_linked_respawn`)");
objmgr.LoadCreatureLinkedRespawn(); objmgr.LoadCreatureLinkedRespawn();
@@ -1193,7 +1193,7 @@ bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg)
return true; return true;
} }
bool ChatHandler::HandleReloadEventAITextsCommand(const char* arg) bool ChatHandler::HandleReloadEventAITextsCommand(const char* /*args*/)
{ {
sLog.outString("Re-Loading Texts from `creature_ai_texts`..."); sLog.outString("Re-Loading Texts from `creature_ai_texts`...");
@@ -1202,7 +1202,7 @@ bool ChatHandler::HandleReloadEventAITextsCommand(const char* arg)
return true; return true;
} }
bool ChatHandler::HandleReloadEventAISummonsCommand(const char* arg) bool ChatHandler::HandleReloadEventAISummonsCommand(const char* /*args*/)
{ {
sLog.outString("Re-Loading Summons from `creature_ai_summons`..."); sLog.outString("Re-Loading Summons from `creature_ai_summons`...");
CreatureEAI_Mgr.LoadCreatureEventAI_Summons(); CreatureEAI_Mgr.LoadCreatureEventAI_Summons();
@@ -1210,7 +1210,7 @@ bool ChatHandler::HandleReloadEventAISummonsCommand(const char* arg)
return true; return true;
} }
bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* arg) bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* /*args*/)
{ {
sLog.outString("Re-Loading Scripts from `creature_ai_scripts`..."); sLog.outString("Re-Loading Scripts from `creature_ai_scripts`...");
CreatureEAI_Mgr.LoadCreatureEventAI_Scripts(); CreatureEAI_Mgr.LoadCreatureEventAI_Scripts();
@@ -1391,7 +1391,7 @@ bool ChatHandler::HandleReloadMailLevelRewardCommand(const char* /*arg*/)
return true; return true;
} }
bool ChatHandler::HandleReloadAuctionsCommand(const char *args) bool ChatHandler::HandleReloadAuctionsCommand(const char * /*args*/)
{ {
///- Reload dynamic data tables from the database ///- Reload dynamic data tables from the database
sLog.outString("Re-Loading Auctions..."); sLog.outString("Re-Loading Auctions...");
@@ -5113,7 +5113,7 @@ bool ChatHandler::HandleListAurasCommand (const char * /*args*/)
PSendSysMessage(LANG_COMMAND_TARGET_LISTAURATYPE, uAuraList.size(), i); PSendSysMessage(LANG_COMMAND_TARGET_LISTAURATYPE, uAuraList.size(), i);
for (Unit::AuraEffectList::const_iterator itr = uAuraList.begin(); itr != uAuraList.end(); ++itr) 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()]; char const* name = (*itr)->GetSpellProto()->SpellName[GetSessionDbcLocale()];
@@ -7414,7 +7414,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
return true; return true;
} }
bool ChatHandler::HandleListFreezeCommand(const char *args) bool ChatHandler::HandleListFreezeCommand(const char * /*args*/)
{ {
//Get names from DB //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"); 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; return true;
} }
bool ChatHandler::HandlePossessCommand(const char *args) bool ChatHandler::HandlePossessCommand(const char * /*args*/)
{ {
Unit *pUnit = getSelectedUnit(); Unit *pUnit = getSelectedUnit();
if (!pUnit) if (!pUnit)
@@ -7489,7 +7489,7 @@ bool ChatHandler::HandlePossessCommand(const char *args)
return true; return true;
} }
bool ChatHandler::HandleUnPossessCommand(const char *args) bool ChatHandler::HandleUnPossessCommand(const char * /*args*/)
{ {
Unit *pUnit = getSelectedUnit(); Unit *pUnit = getSelectedUnit();
if (!pUnit) if (!pUnit)
@@ -7500,7 +7500,7 @@ bool ChatHandler::HandleUnPossessCommand(const char *args)
return true; return true;
} }
bool ChatHandler::HandleBindSightCommand(const char *args) bool ChatHandler::HandleBindSightCommand(const char * /*args*/)
{ {
Unit *pUnit = getSelectedUnit(); Unit *pUnit = getSelectedUnit();
if (!pUnit) if (!pUnit)
@@ -7510,7 +7510,7 @@ bool ChatHandler::HandleBindSightCommand(const char *args)
return true; return true;
} }
bool ChatHandler::HandleUnbindSightCommand(const char *args) bool ChatHandler::HandleUnbindSightCommand(const char * /*args*/)
{ {
if (m_session->GetPlayer()->isPossessing()) if (m_session->GetPlayer()->isPossessing())
return false; return false;
src/game/LootMgr.cpp
+1 -1
View File
@@ -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) for (LootStoreItemList::const_iterator ieItr=ExplicitlyChanced.begin(); ieItr != ExplicitlyChanced.end(); ++ieItr)
{ {
src/game/Map.cpp
+3 -3
View File
@@ -1254,7 +1254,7 @@ void GridMap::unloadData()
m_gridGetHeight = &GridMap::getHeightFromFlat; 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; map_areaHeader header;
fseek(in, offset, SEEK_SET); fseek(in, offset, SEEK_SET);
@@ -1271,7 +1271,7 @@ bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 size)
return true; return true;
} }
bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size) bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 /*size*/)
{ {
map_heightHeader header; map_heightHeader header;
fseek(in, offset, SEEK_SET); fseek(in, offset, SEEK_SET);
@@ -1314,7 +1314,7 @@ bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size)
return true; return true;
} }
bool GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 size) bool GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 /*size*/)
{ {
map_liquidHeader header; map_liquidHeader header;
fseek(in, offset, SEEK_SET); fseek(in, offset, SEEK_SET);
src/game/MapInstanced.cpp
+1 -1
View File
@@ -257,7 +257,7 @@ bool MapInstanced::DestroyInstance(InstancedMaps::iterator &itr)
return true; return true;
} }
bool MapInstanced::CanEnter(Player *player) bool MapInstanced::CanEnter(Player * /*player*/)
{ {
//assert(false); //assert(false);
return true; return true;
src/game/MapManager.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ Map* MapManager::_createBaseMap(uint32 id)
return m; return m;
} }
Map* MapManager::CreateMap(uint32 id, const WorldObject* obj, uint32 instanceId) Map* MapManager::CreateMap(uint32 id, const WorldObject* obj, uint32 /*instanceId*/)
{ {
ASSERT(obj); 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()); //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());
src/game/MiscHandler.cpp
+2 -2
View File
@@ -1673,7 +1673,7 @@ void WorldSession::HandleQueryInspectAchievements(WorldPacket & recv_data)
player->GetAchievementMgr().SendRespondInspectAchievements(_player); player->GetAchievementMgr().SendRespondInspectAchievements(_player);
} }
void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& recv_data) void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& /*recv_data*/)
{ {
// empty opcode // empty opcode
sLog.outDebug("WORLD: CMSG_WORLD_STATE_UI_TIMER_UPDATE"); sLog.outDebug("WORLD: CMSG_WORLD_STATE_UI_TIMER_UPDATE");
@@ -1683,7 +1683,7 @@ void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& recv_data)
SendPacket(&data); SendPacket(&data);
} }
void WorldSession::HandleReadyForAccountDataTimes(WorldPacket& recv_data) void WorldSession::HandleReadyForAccountDataTimes(WorldPacket& /*recv_data*/)
{ {
// empty opcode // empty opcode
sLog.outDebug("WORLD: CMSG_READY_FOR_ACCOUNT_DATA_TIMES"); sLog.outDebug("WORLD: CMSG_READY_FOR_ACCOUNT_DATA_TIMES");
src/game/MovementGeneratorImpl.h
+1 -1
View File
@@ -25,7 +25,7 @@
template<class MOVEMENT_GEN> template<class MOVEMENT_GEN>
inline MovementGenerator* inline MovementGenerator*
MovementGeneratorFactory<MOVEMENT_GEN>::Create(void *data) const MovementGeneratorFactory<MOVEMENT_GEN>::Create(void * /*data*/) const
{ {
return (new MOVEMENT_GEN()); return (new MOVEMENT_GEN());
} }
src/game/Object.cpp
+3 -3
View File
@@ -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()) if (Map *map = FindMap())
{ {
@@ -2099,7 +2099,7 @@ void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float abs
Trinity::NormalizeMapCoord(y); 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); GetNearPoint2D(x,y,distance2d+searcher_size,absAngle);
z = GetPositionZ(); z = GetPositionZ();
src/game/ObjectMgr.cpp
+2 -2
View File
@@ -997,7 +997,7 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelid)
return sCreatureModelStorage.LookupEntry<CreatureModelInfo>(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) // Load creature model (display id)
uint32 display_id = 0; uint32 display_id = 0;
@@ -1484,7 +1484,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos)
return true; 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); CreatureInfo const *cInfo = GetCreatureTemplate(entry);
if (!cInfo) if (!cInfo)
src/game/OutdoorPvP.cpp
+9 -9
View File
@@ -234,12 +234,12 @@ OutdoorPvP::~OutdoorPvP()
DeleteSpawns(); DeleteSpawns();
} }
void OutdoorPvP::HandlePlayerEnterZone(Player * plr, uint32 zone) void OutdoorPvP::HandlePlayerEnterZone(Player * plr, uint32 /*zone*/)
{ {
m_players[plr->GetTeamId()].insert(plr); 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 // inform the objectives of the leaving
for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) 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()); 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; return false;
} }
bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 /*spellId*/, GameObject * /*go*/)
{ {
if (!plr->IsOutdoorPvPActive()) if (!plr->IsOutdoorPvPActive())
return false; return false;
@@ -524,22 +524,22 @@ bool OutdoorPvP::HandleDropFlag(Player * plr, uint32 id)
return false; return false;
} }
bool OPvPCapturePoint::HandleGossipOption(Player * plr, uint64 guid, uint32 id) bool OPvPCapturePoint::HandleGossipOption(Player * /*plr*/, uint64 /*guid*/, uint32 /*id*/)
{ {
return false; return false;
} }
bool OPvPCapturePoint::CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso) bool OPvPCapturePoint::CanTalkTo(Player * /*plr*/, Creature * /*c*/, GossipMenuItems /*gso*/)
{ {
return false; return false;
} }
bool OPvPCapturePoint::HandleDropFlag(Player * plr, uint32 id) bool OPvPCapturePoint::HandleDropFlag(Player * /*plr*/, uint32 /*id*/)
{ {
return false; 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); std::map<uint64,uint32>::iterator itr = m_ObjectTypes.find(guid);
if (itr != m_ObjectTypes.end()) if (itr != m_ObjectTypes.end())
@@ -549,7 +549,7 @@ int32 OPvPCapturePoint::HandleOpenGo(Player *plr, uint64 guid)
return -1; return -1;
} }
bool OutdoorPvP::HandleAreaTrigger(Player *plr, uint32 trigger) bool OutdoorPvP::HandleAreaTrigger(Player * /*plr*/, uint32 /*trigger*/)
{ {
return false; return false;
} }
src/game/OutdoorPvP.h
+7 -7
View File
@@ -91,7 +91,7 @@ class OPvPCapturePoint
public: public:
OPvPCapturePoint(OutdoorPvP * pvp); OPvPCapturePoint(OutdoorPvP * pvp);
virtual void FillInitialWorldStates(WorldPacket & data) {} virtual void FillInitialWorldStates(WorldPacket & /*data*/) {}
// send world state update to all players present // send world state update to all players present
void SendUpdateWorldState(uint32 field, uint32 value); 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. // 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 bool Update(uint32 diff);
virtual void ChangeState() = 0; virtual void ChangeState() = 0;
virtual void ChangeTeam(TeamId oldTeam) {} virtual void ChangeTeam(TeamId /*oldTeam*/) {}
virtual void SendChangePhase(); virtual void SendChangePhase();
virtual bool HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid); virtual bool HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid);
@@ -181,7 +181,7 @@ public:
typedef std::map<uint32/*lowguid*/, OPvPCapturePoint*> OPvPCapturePointMap; typedef std::map<uint32/*lowguid*/, OPvPCapturePoint*> OPvPCapturePointMap;
virtual void FillInitialWorldStates(WorldPacket & data) {} virtual void FillInitialWorldStates(WorldPacket & /*data*/) {}
// called when a player triggers an areatrigger // called when a player triggers an areatrigger
virtual bool HandleAreaTrigger(Player * plr, uint32 trigger); virtual bool HandleAreaTrigger(Player * plr, uint32 trigger);
// called on custom spell // called on custom spell
@@ -193,7 +193,7 @@ public:
virtual bool SetupOutdoorPvP() {return true;} virtual bool SetupOutdoorPvP() {return true;}
void OnGameObjectCreate(GameObject *go, bool add); void OnGameObjectCreate(GameObject *go, bool add);
void OnCreatureCreate(Creature *, bool add) {} void OnCreatureCreate(Creature *, bool /*add*/) {}
// send world state update to all players present // send world state update to all players present
void SendUpdateWorldState(uint32 field, uint32 value); void SendUpdateWorldState(uint32 field, uint32 value);
@@ -203,13 +203,13 @@ public:
// handle npc/player kill // handle npc/player kill
virtual void HandleKill(Player * killer, Unit * killed); 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 // checks if player is in range of a capture credit marker
bool IsInsideObjective(Player * plr) const; bool IsInsideObjective(Player * plr) const;
// awards rewards for player kill // awards rewards for player kill
virtual void AwardKillBonus(Player * plr) {} virtual void AwardKillBonus(Player * /*plr*/) {}
uint32 GetTypeId() {return m_TypeId;} uint32 GetTypeId() {return m_TypeId;}
@@ -230,7 +230,7 @@ protected:
bool m_sendUpdate; bool m_sendUpdate;
// world state stuff // world state stuff
virtual void SendRemoveWorldStates(Player * plr) {} virtual void SendRemoveWorldStates(Player * /*plr*/) {}
void BroadcastPacket(WorldPacket & data) const; void BroadcastPacket(WorldPacket & data) const;
src/game/OutdoorPvPNA.cpp
+1 -1
View File
@@ -334,7 +334,7 @@ bool OutdoorPvPNA::Update(uint32 diff)
return m_obj->Update(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; std::vector<uint32> nodes;
nodes.resize(2); nodes.resize(2);
src/game/OutdoorPvPSI.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ bool OutdoorPvPSI::SetupOutdoorPvP()
return true; return true;
} }
bool OutdoorPvPSI::Update(uint32 diff) bool OutdoorPvPSI::Update(uint32 /*diff*/)
{ {
return false; return false;
} }
src/game/OutdoorPvPZM.cpp
+3 -3
View File
@@ -201,7 +201,7 @@ void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit * killed)
plr->CastSpell(plr,ZM_HordePlayerKillReward,true); plr->CastSpell(plr,ZM_HordePlayerKillReward,true);
} }
bool OPvPCapturePointZM_GraveYard::Update(uint32 diff) bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/)
{ {
bool retval = m_State != m_OldState; bool retval = m_State != m_OldState;
m_State = m_OldState; m_State = m_OldState;
@@ -340,7 +340,7 @@ bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipM
return false; 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); std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid);
if (itr != m_CreatureTypes.end()) if (itr != m_CreatureTypes.end())
@@ -368,7 +368,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid,
return false; return false;
} }
bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * plr, uint32 spellId) bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * /*plr*/, uint32 spellId)
{ {
switch(spellId) switch(spellId)
{ {
src/game/PassiveAI.cpp
+3 -3
View File
@@ -37,7 +37,7 @@ void PossessedAI::AttackStart(Unit *target)
me->Attack(target, true); me->Attack(target, true);
} }
void PossessedAI::UpdateAI(const uint32 diff) void PossessedAI::UpdateAI(const uint32 /*diff*/)
{ {
if (me->getVictim()) 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 // We died while possessed, disable our loot
me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); 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); 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)) if (!me->hasUnitState(UNIT_STAT_FLEEING))
me->SetControlled(true, UNIT_STAT_FLEEING); me->SetControlled(true, UNIT_STAT_FLEEING);
src/game/PassiveAI.h
+1 -1
View File
@@ -61,7 +61,7 @@ class NullCreatureAI : public CreatureAI
void AttackStart(Unit *) {} void AttackStart(Unit *) {}
void UpdateAI(const uint32) {} void UpdateAI(const uint32) {}
void EnterEvadeMode() {} void EnterEvadeMode() {}
void OnCharmed(bool apply) {} void OnCharmed(bool /*apply*/) {}
static int Permissible(const Creature *) { return PERMIT_BASE_IDLE; } static int Permissible(const Creature *) { return PERMIT_BASE_IDLE; }
}; };
src/game/PetAI.h
+2 -2
View File
@@ -34,12 +34,12 @@ class PetAI : public CreatureAI
explicit PetAI(Creature *c); explicit PetAI(Creature *c);
void EnterEvadeMode(); void EnterEvadeMode();
void JustDied(Unit *who) { _stopAttack(); } void JustDied(Unit * /*who*/) { _stopAttack(); }
void UpdateAI(const uint32); void UpdateAI(const uint32);
static int Permissible(const Creature *); static int Permissible(const Creature *);
void KilledUnit(Unit *victim); void KilledUnit(Unit * /*victim*/);
void AttackStart(Unit *target); void AttackStart(Unit *target);
void MovementInform(uint32 moveType, uint32 data); void MovementInform(uint32 moveType, uint32 data);
src/game/Player.cpp
+13 -16
View File
@@ -560,7 +560,7 @@ void Player::CleanupsBeforeDelete(bool finalCleanup)
itr->second.save->RemovePlayer(this); 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 //FIXME: outfitId not used in player creating
@@ -963,7 +963,6 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
default: default:
return 0; return 0;
} }
return 0;
} }
void Player::UpdateMirrorTimers() void Player::UpdateMirrorTimers()
@@ -1168,7 +1167,7 @@ void Player::Update(uint32 p_time)
//if (m_spellModTakingSpell) //if (m_spellModTakingSpell)
sLog.outCrash("Player has m_spellModTakingSpell %u during update!", m_spellModTakingSpell->m_spellInfo->Id); sLog.outCrash("Player has m_spellModTakingSpell %u during update!", m_spellModTakingSpell->m_spellInfo->Id);
return; return;
m_spellModTakingSpell = NULL; //m_spellModTakingSpell = NULL;
} }
//used to implement delayed far teleports //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; uint64 victim_guid = 0;
uint32 victim_rank = 0; uint32 victim_rank = 0;
uint32 rank_diff = 0; //uint32 rank_diff = 0;
time_t now = time(NULL); //time_t now = time(NULL);
// need call before fields update to have chance move yesterday data to appropriate fields before today data change. // need call before fields update to have chance move yesterday data to appropriate fields before today data change.
UpdateHonorFields(); UpdateHonorFields();
@@ -12981,8 +12980,8 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
break; break;
// case ITEM_MOD_FERAL_ATTACK_POWER: // case ITEM_MOD_FERAL_ATTACK_POWER:
// ((Player*)this)->ApplyFeralAPBonus(enchant_amount, apply); // ((Player*)this)->ApplyFeralAPBonus(enchant_amount, apply);
sLog.outDebug("+ %u FERAL_ATTACK_POWER", enchant_amount); // sLog.outDebug("+ %u FERAL_ATTACK_POWER", enchant_amount);
break; // break;
case ITEM_MOD_MANA_REGENERATION: case ITEM_MOD_MANA_REGENERATION:
((Player*)this)->ApplyManaRegenBonus(enchant_amount, apply); ((Player*)this)->ApplyManaRegenBonus(enchant_amount, apply);
sLog.outDebug("+ %u MANA_REGENERATION", enchant_amount); sLog.outDebug("+ %u MANA_REGENERATION", enchant_amount);
@@ -14579,7 +14578,7 @@ bool Player::SatisfyQuestDay(Quest const* qInfo, bool msg)
return true; return true;
} }
bool Player::SatisfyQuestWeek( Quest const* qInfo, bool msg ) bool Player::SatisfyQuestWeek(Quest const* qInfo, bool /*msg*/)
{ {
if (!qInfo->IsWeekly() || m_weeklyquests.empty()) if (!qInfo->IsWeekly() || m_weeklyquests.empty())
return true; 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); WorldPacket data(SMSG_QUESTUPDATE_ADD_ITEM, 0);
sLog.outDebug("WORLD: Sent SMSG_QUESTUPDATE_ADD_ITEM"); 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; return true;
} }
void Player::SetHomebind(WorldLocation const& loc, uint32 area_id) void Player::SetHomebind(WorldLocation const& /*loc*/, uint32 /*area_id*/)
{ {
m_homebindMapId = GetMapId(); m_homebindMapId = GetMapId();
m_homebindAreaId = GetAreaId(); m_homebindAreaId = GetAreaId();
@@ -16211,7 +16210,7 @@ bool Player::isAllowedToLoot(const Creature* creature)
return false; return false;
} }
void Player::_LoadActions(QueryResult_AutoPtr result, bool startup) void Player::_LoadActions(QueryResult_AutoPtr result, bool /*startup*/)
{ {
if (result) if (result)
{ {
@@ -18533,14 +18532,12 @@ void Player::CharmSpellInitialize()
uint8 addlist = 0; uint8 addlist = 0;
if (charm->GetTypeId() != TYPEID_PLAYER) 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) //if (cinfo && cinfo->type == CREATURE_TYPE_DEMON && getClass() == CLASS_WARLOCK)
{ {
for (uint32 i = 0; i < MAX_SPELL_CHARM; ++i) for (uint32 i = 0; i < MAX_SPELL_CHARM; ++i)
{
if (charmInfo->GetCharmSpell(i)->GetAction()) if (charmInfo->GetCharmSpell(i)->GetAction())
++addlist; ++addlist;
}
} }
} }
@@ -20247,13 +20244,13 @@ bool Player::IsVisibleGloballyFor(Player* u) const
} }
template<class T> 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()); s64.insert(target->GetGUID());
} }
template<> 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()) if (!target->IsTransport())
s64.insert(target->GetGUID()); s64.insert(target->GetGUID());
src/game/PointMovementGenerator.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ void PointMovementGenerator<T>:: Finalize(T &unit)
} }
template<class T> template<class T>
void PointMovementGenerator<T>::MovementInform(T &unit) void PointMovementGenerator<T>::MovementInform(T & /*unit*/)
{ {
} }
src/game/QuestHandler.cpp
+1 -1
View File
@@ -693,7 +693,7 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
SendPacket(&data); SendPacket(&data);
} }
void WorldSession::HandleQueryQuestsCompleted(WorldPacket & recv_data) void WorldSession::HandleQueryQuestsCompleted(WorldPacket & /*recv_data*/)
{ {
uint32 count = 0; uint32 count = 0;
src/game/RandomMovementGenerator.cpp
+3 -3
View File
@@ -57,8 +57,8 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)
Map const* map = creature.GetBaseMap(); Map const* map = creature.GetBaseMap();
// For 2D/3D system selection // For 2D/3D system selection
bool is_land_ok = creature.canWalk(); //bool is_land_ok = creature.canWalk();
bool is_water_ok = creature.canSwim(); //bool is_water_ok = creature.canSwim();
bool is_air_ok = creature.canFly(); bool is_air_ok = creature.canFly();
for (uint32 i = 0; ; ++i) for (uint32 i = 0; ; ++i)
@@ -162,7 +162,7 @@ RandomMovementGenerator<Creature>::Reset(Creature &creature)
template<> template<>
void void
RandomMovementGenerator<Creature>::Finalize(Creature &creature){} RandomMovementGenerator<Creature>::Finalize(Creature & /*creature*/){}
template<> template<>
bool bool
src/game/ScriptedCreature.cpp
+1 -3
View File
@@ -100,7 +100,7 @@ void ScriptedAI::AttackStartNoMove(Unit* pWho)
DoStartNoMovement(pWho); DoStartNoMovement(pWho);
} }
void ScriptedAI::UpdateAI(const uint32 uiDiff) void ScriptedAI::UpdateAI(const uint32 /*uiDiff*/)
{ {
//Check if we have a current target //Check if we have a current target
if (!UpdateVictim()) if (!UpdateVictim())
@@ -195,8 +195,6 @@ Unit* ScriptedAI::SelectUnit(SelectAggroTarget pTarget, uint32 uiPosition)
default: default:
return UnitAI::SelectTarget(pTarget, uiPosition); 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) SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 uiMechanic, SelectTargetType selectTargets, uint32 uiPowerCostMin, uint32 uiPowerCostMax, float fRangeMin, float fRangeMax, SelectEffect selectEffects)
src/game/ScriptedCreature.h
+11 -11
View File
@@ -52,16 +52,16 @@ struct ScriptedAI : public CreatureAI
void AttackStartNoMove(Unit *pTarget); void AttackStartNoMove(Unit *pTarget);
// Called at any Damage from any attacker (before damage apply) // 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 //Called at World update tick
void UpdateAI(const uint32); void UpdateAI(const uint32);
//Called at creature death //Called at creature death
void JustDied(Unit* who){} void JustDied(Unit* /*who*/){}
//Called at creature killing another unit //Called at creature killing another unit
void KilledUnit(Unit* who){} void KilledUnit(Unit* /*who*/){}
// Called when the creature summon successfully other creature // Called when the creature summon successfully other creature
void JustSummoned(Creature*) {} void JustSummoned(Creature*) {}
@@ -70,16 +70,16 @@ struct ScriptedAI : public CreatureAI
void SummonedCreatureDespawn(Creature*) {} void SummonedCreatureDespawn(Creature*) {}
// Called when hit by a spell // 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 // 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 //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 // Called when AI is temporarily replaced or put back when possess is applied or removed
void OnPossess(bool apply) {} void OnPossess(bool /*apply*/) {}
//************* //*************
// Variables // Variables
@@ -99,7 +99,7 @@ struct ScriptedAI : public CreatureAI
void Reset() {} void Reset() {}
//Called at creature aggro either by MoveInLOS or Attack Start //Called at creature aggro either by MoveInLOS or Attack Start
void EnterCombat(Unit* who) {} void EnterCombat(Unit* /*who*/) {}
//************* //*************
//AI Helper Functions //AI Helper Functions
@@ -129,7 +129,7 @@ struct ScriptedAI : public CreatureAI
void DoTeleportTo(float fX, float fY, float fZ, uint32 uiTime = 0); void DoTeleportTo(float fX, float fY, float fZ, uint32 uiTime = 0);
void DoTeleportTo(const float pos[4]); 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) //Teleports a player without dropping threat (only teleports to same map)
void DoTeleportPlayer(Unit* pUnit, float fX, float fY, float fZ, float fO); 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 UpdateAI(const uint32 diff) = 0;
void Reset() { _Reset(); } void Reset() { _Reset(); }
void EnterCombat(Unit *who) { _EnterCombat(); } void EnterCombat(Unit * /*who*/) { _EnterCombat(); }
void JustDied(Unit *killer) { _JustDied(); } void JustDied(Unit * /*killer*/) { _JustDied(); }
void JustReachedHome() { me->setActive(false); } void JustReachedHome() { me->setActive(false); }
protected: protected:
src/game/ScriptedEscortAI.cpp
+2 -2
View File
@@ -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) if (!HasEscortState(STATE_ESCORT_ESCORTING) || !m_uiPlayerGUID || !m_pQuestForEscort)
return; return;
@@ -300,7 +300,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
UpdateEscortAI(uiDiff); UpdateEscortAI(uiDiff);
} }
void npc_escortAI::UpdateEscortAI(const uint32 uiDiff) void npc_escortAI::UpdateEscortAI(const uint32 /*uiDiff*/)
{ {
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
src/game/ScriptedEscortAI.h
+1 -1
View File
@@ -63,7 +63,7 @@ struct npc_escortAI : public ScriptedAI
void AddWaypoint(uint32 id, float x, float y, float z, uint32 WaitTimeMs = 0); void AddWaypoint(uint32 id, float x, float y, float z, uint32 WaitTimeMs = 0);
virtual void WaypointReached(uint32 uiPointId) = 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); void Start(bool bIsActiveAttacker = true, bool bRun = false, uint64 uiPlayerGUID = 0, const Quest* pQuest = NULL, bool bInstantRespawn = false, bool bCanLoopPath = false);
src/game/ScriptedFollowerAI.cpp
+2 -2
View File
@@ -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) if (!HasFollowState(STATE_FOLLOW_INPROGRESS) || !m_uiLeaderGUID || !m_pQuestForFollow)
return; return;
@@ -244,7 +244,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
UpdateFollowerAI(uiDiff); UpdateFollowerAI(uiDiff);
} }
void FollowerAI::UpdateFollowerAI(const uint32 uiDiff) void FollowerAI::UpdateFollowerAI(const uint32 /*uiDiff*/)
{ {
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
src/game/ScriptedGuardAI.h
+1 -1
View File
@@ -18,7 +18,7 @@ struct guardAI : public ScriptedAI
void Reset(); void Reset();
void EnterCombat(Unit *who); void EnterCombat(Unit * /*who*/);
void JustDied(Unit *Killer); void JustDied(Unit *Killer);
src/game/ScriptedSimpleAI.h
+2 -2
View File
@@ -25,9 +25,9 @@ struct SimpleAI : public ScriptedAI
void Reset(); void Reset();
void EnterCombat(Unit *who); void EnterCombat(Unit * /*who*/);
void KilledUnit(Unit *victim); void KilledUnit(Unit * /*victim*/);
void DamageTaken(Unit *killer, uint32 &damage); void DamageTaken(Unit *killer, uint32 &damage);
src/game/Spell.cpp
+3 -3
View File
@@ -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: // Now fill data for trigger system, need know:
@@ -1527,7 +1527,7 @@ bool Spell::UpdateChanneledTargetList()
needAuraMask &= needAliveTargetMask; needAuraMask &= needAliveTargetMask;
float range; float range = 0;
if (needAuraMask) if (needAuraMask)
{ {
range = GetSpellMaxRange(m_spellInfo, IsPositiveSpell(m_spellInfo->Id)); range = GetSpellMaxRange(m_spellInfo, IsPositiveSpell(m_spellInfo->Id));
@@ -3516,7 +3516,7 @@ void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 ca
break; break;
case SPELL_FAILED_TOO_MANY_OF_ITEM: case SPELL_FAILED_TOO_MANY_OF_ITEM:
{ {
uint32 item; uint32 item = 0;
for (int8 x=0;x < 3;x++) for (int8 x=0;x < 3;x++)
if (spellInfo->EffectItemType[x]) if (spellInfo->EffectItemType[x])
item = spellInfo->EffectItemType[x]; item = spellInfo->EffectItemType[x];
src/game/SpellAuraEffects.cpp
+29 -29
View File
@@ -876,7 +876,7 @@ void AuraEffect::CalculateSpellMod()
void AuraEffect::ChangeAmount(int32 newAmount, bool mark) void AuraEffect::ChangeAmount(int32 newAmount, bool mark)
{ {
Unit * caster = GetCaster(); //Unit * caster = GetCaster();
// Reapply if amount change // Reapply if amount change
if (newAmount != GetAmount()) if (newAmount != GetAmount())
{ {
@@ -2331,7 +2331,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
{ {
uint32 spellId = 0; uint32 spellId = 0;
uint32 spellId2 = 0; uint32 spellId2 = 0;
uint32 spellId3 = 0; //uint32 spellId3 = 0;
uint32 HotWSpellId = 0; uint32 HotWSpellId = 0;
switch(GetMiscValue()) switch(GetMiscValue())
@@ -3495,7 +3495,7 @@ void AuraEffect::HandleAuraUntrackable(AuraApplication const * aurApp, uint8 mod
/*** SKILLS & TALENTS ***/ /*** 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)) if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK))
return; return;
@@ -3510,7 +3510,7 @@ void AuraEffect::HandleAuraModPetTalentsPoints(AuraApplication const * aurApp, u
pet->InitTalentForLevel(); 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(); Unit * target = aurApp->GetTarget();
@@ -3679,7 +3679,7 @@ void AuraEffect::HandleAuraHover(AuraApplication const * aurApp, uint8 mode, boo
target->SendMessageToSet(&data,true); 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)) if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK))
return; return;
@@ -3968,7 +3968,7 @@ void AuraEffect::HandleAuraControlVehicle(AuraApplication const * aurApp, uint8
/*********************************************************/ /*********************************************************/
/*** MODIFY SPEED ***/ /*** 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)) if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK))
return; return;
@@ -3978,7 +3978,7 @@ void AuraEffect::HandleAuraModIncreaseSpeed(AuraApplication const * aurApp, uint
target->UpdateSpeed(MOVE_RUN, true); 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)) if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK))
return; return;
@@ -4030,7 +4030,7 @@ void AuraEffect::HandleAuraModIncreaseFlightSpeed(AuraApplication const * aurApp
target->UpdateSpeed(MOVE_FLIGHT, true); 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)) if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK))
return; return;
@@ -4040,7 +4040,7 @@ void AuraEffect::HandleAuraModIncreaseSwimSpeed(AuraApplication const * aurApp,
target->UpdateSpeed(MOVE_SWIM, true); 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)) if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK))
return; return;
@@ -4055,7 +4055,7 @@ void AuraEffect::HandleAuraModDecreaseSpeed(AuraApplication const * aurApp, uint
target->UpdateSpeed(MOVE_FLIGHT_BACK, true); 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)) if (!(mode & AURA_EFFECT_HANDLE_REAL))
return; 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4467,7 +4467,7 @@ void AuraEffect::HandleModSpellDamagePercentFromStat(AuraApplication const * aur
target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4481,7 +4481,7 @@ void AuraEffect::HandleModSpellHealingPercentFromStat(AuraApplication const * au
target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4497,7 +4497,7 @@ void AuraEffect::HandleModSpellDamagePercentFromAttackPower(AuraApplication cons
target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4511,7 +4511,7 @@ void AuraEffect::HandleModSpellHealingPercentFromAttackPower(AuraApplication con
target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4583,7 +4583,7 @@ void AuraEffect::HandleAuraModResistenceOfStatPercent(AuraApplication const * au
target->UpdateArmor(); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4600,7 +4600,7 @@ void AuraEffect::HandleAuraModExpertise(AuraApplication const * aurApp, uint8 mo
/********************************/ /********************************/
/*** HEAL & ENERGIZE ***/ /*** 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; 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 // 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; 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 // 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4764,7 +4764,7 @@ void AuraEffect::HandleAuraIncreaseBaseHealthPercent(AuraApplication const * aur
/*** FIGHT ***/ /*** 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4777,7 +4777,7 @@ void AuraEffect::HandleAuraModParryPercent(AuraApplication const * aurApp, uint8
target->ToPlayer()->UpdateParryPercentage(); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4790,7 +4790,7 @@ void AuraEffect::HandleAuraModDodgePercent(AuraApplication const * aurApp, uint8
target->ToPlayer()->UpdateDodgePercentage(); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4803,7 +4803,7 @@ void AuraEffect::HandleAuraModBlockPercent(AuraApplication const * aurApp, uint8
target->ToPlayer()->UpdateBlockPercentage(); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -4891,7 +4891,7 @@ void AuraEffect::HandleModSpellCritChance(AuraApplication const * aurApp, uint8
target->m_baseSpellCritChance += (apply) ? GetAmount():-GetAmount(); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -5099,7 +5099,7 @@ void AuraEffect::HandleAuraModRangedAttackPowerPercent(AuraApplication const * a
target->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_PCT, float(GetAmount()), apply); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -5111,7 +5111,7 @@ void AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication con
target->ToPlayer()->UpdateAttackPowerAndDamage(true); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
@@ -5123,7 +5123,7 @@ void AuraEffect::HandleAuraModAttackPowerOfStatPercent(AuraApplication const * a
target->ToPlayer()->UpdateAttackPowerAndDamage(false); 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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; 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)) if (!(mode & AURA_EFFECT_HANDLE_REAL))
return; return;
src/game/SpellAuraEffects.h
+3 -3
View File
@@ -101,15 +101,15 @@ class AuraEffect
public: public:
// aura effect handlers // 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 // not implemented
} }
void HandleUnused(AuraApplication const * aurApp, uint8 mode, bool apply) const void HandleUnused(AuraApplication const * /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const
{ {
// useless // 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 // aura type not have immediate effect at add/remove and handled by ID in other code place
} }
src/game/SpellAuras.cpp
+4 -4
View File
@@ -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 // 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 // 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 // targets have to be registered and not have effect applied yet to use this function
void Aura::_ApplyEffectForTargets(uint8 effIndex) void Aura::_ApplyEffectForTargets(uint8 effIndex)
{ {
Unit * caster = GetCaster(); //Unit * caster = GetCaster();
// prepare list of aura targets // prepare list of aura targets
UnitList targetList; UnitList targetList;
for (ApplicationMap::iterator appIter = m_applications.begin(); appIter != m_applications.end(); ++appIter) for (ApplicationMap::iterator appIter = m_applications.begin(); appIter != m_applications.end(); ++appIter)
@@ -711,7 +711,7 @@ bool Aura::DropCharge()
return false; return false;
} }
void Aura::SetStackAmount(uint8 stackAmount, bool applied) void Aura::SetStackAmount(uint8 stackAmount, bool /*applied*/)
{ {
if (stackAmount != m_stackAmount) if (stackAmount != m_stackAmount)
{ {
@@ -1618,7 +1618,7 @@ void DynObjAura::Remove(AuraRemoveMode removeMode)
_Remove(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(); Unit * dynObjOwnerCaster = GetDynobjOwner()->GetCaster();
float radius = GetDynobjOwner()->GetRadius(); float radius = GetDynobjOwner()->GetRadius();
src/game/SpellEffects.cpp
+12 -12
View File
@@ -312,7 +312,7 @@ void Spell::EffectEnvirinmentalDMG(uint32 i)
m_caster->ToPlayer()->EnvironmentalDamage(DAMAGE_FIRE, damage); 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; ++count;
if (count) if (count)
{ {
uint32 spellId; uint32 spellId = 0;
switch (m_spellInfo->Id) switch (m_spellInfo->Id)
{ {
case 28062: spellId = 29659; break; case 28062: spellId = 29659; break;
@@ -989,7 +989,7 @@ void Spell::EffectDummy(uint32 i)
Creature* creatureTarget = unitTarget->ToCreature(); 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"); sLog.outDebug("SummonGameObject at SpellEfects.cpp EffectDummy for Spell 23019");
creatureTarget->ForcedDespawn(); creatureTarget->ForcedDespawn();
@@ -2514,7 +2514,7 @@ void Spell::EffectJump(uint32 i)
m_caster->GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ); m_caster->GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ);
} }
void Spell::EffectTeleportUnits(uint32 i) void Spell::EffectTeleportUnits(uint32 /*i*/)
{ {
if (!unitTarget || unitTarget->isInFlight()) if (!unitTarget || unitTarget->isInFlight())
return; return;
@@ -2753,7 +2753,7 @@ void Spell::EffectPowerBurn(uint32 i)
if (damage < 0) if (damage < 0)
return; 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) // burn x% of target's mana, up to maximum of 2x% of caster's mana (Mana Burn)
if (m_spellInfo->ManaCostPercentage) if (m_spellInfo->ManaCostPercentage)
@@ -2980,7 +2980,7 @@ void Spell::EffectHealthLeech(uint32 i)
// m_damage+=new_damage; // m_damage+=new_damage;
} }
void Spell::DoCreateItem(uint32 i, uint32 itemtype) void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype)
{ {
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
return; 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) if (m_caster->GetTypeId() != TYPEID_PLAYER)
return; return;
@@ -4435,7 +4435,7 @@ void Spell::EffectTaunt(uint32 /*i*/)
unitTarget->ToCreature()->AI()->AttackStart(m_caster); 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) if (!unitTarget)
return; return;
@@ -6701,7 +6701,7 @@ void Spell::EffectQuestComplete(uint32 i)
pPlayer->AreaExploredOrEventHappens(quest_id); pPlayer->AreaExploredOrEventHappens(quest_id);
} }
void Spell::EffectForceDeselect(uint32 i) void Spell::EffectForceDeselect(uint32 /*i*/)
{ {
WorldPacket data(SMSG_CLEAR_TARGET, 8); WorldPacket data(SMSG_CLEAR_TARGET, 8);
data << uint64(m_caster->GetGUID()); data << uint64(m_caster->GetGUID());
@@ -7456,7 +7456,7 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const *
if (Player* modOwner = m_originalCaster->GetSpellModOwner()) if (Player* modOwner = m_originalCaster->GetSpellModOwner())
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration); 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(); Map *map = caster->GetMap();
for (uint32 count = 0; count < amount; ++count) 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) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
return; return;
src/game/SpellMgr.cpp
-2
View File
@@ -3053,7 +3053,6 @@ bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group)
default: default:
return false; return false;
} }
return false;
} }
DiminishingLevels GetDiminishingReturnsMaxLevel(DiminishingGroup group) DiminishingLevels GetDiminishingReturnsMaxLevel(DiminishingGroup group)
@@ -3065,7 +3064,6 @@ DiminishingLevels GetDiminishingReturnsMaxLevel(DiminishingGroup group)
default: default:
return DIMINISHING_LEVEL_IMMUNE; return DIMINISHING_LEVEL_IMMUNE;
} }
return DIMINISHING_LEVEL_IMMUNE;
} }
DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group) DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group)
src/game/TargetedMovementGenerator.cpp
+1 -1
View File
@@ -251,7 +251,7 @@ TargetedMovementGenerator<T>::GetTarget() const
} }
template<class T> template<class T>
void TargetedMovementGenerator<T>::MovementInform(T &unit) void TargetedMovementGenerator<T>::MovementInform(T & /*unit*/)
{ {
} }
src/game/ThreatManager.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
//============================================================== //==============================================================
// The pHatingUnit is not used yet // 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 (pThreatSpell)
if (Player* modOwner = pHatedUnit->GetSpellModOwner()) if (Player* modOwner = pHatedUnit->GetSpellModOwner())
src/game/Unit.cpp
+14 -14
View File
@@ -1526,7 +1526,7 @@ void Unit::HandleEmoteCommand(uint32 anim_id)
SendMessageToSet(&data, true); 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; uint32 newdamage = 0;
float armor = pVictim->GetArmor(); 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)) if (hasUnitState(UNIT_STAT_CANNOT_AUTOATTACK) || HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
return; return;
@@ -5059,7 +5059,7 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
SendMessageToSet(&data, true); 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; CalcDamageInfo dmgInfo;
dmgInfo.HitInfo = HitInfo; dmgInfo.HitInfo = HitInfo;
@@ -5074,7 +5074,7 @@ void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType,
SendAttackStateUpdate(&dmgInfo); 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(); SpellEntry const *hasteSpell = triggeredByAura->GetSpellProto();
@@ -7449,11 +7449,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
return true; 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 (); SpellEntry const *dummySpell = triggeredByAura->GetSpellProto ();
uint32 effIndex = triggeredByAura->GetEffIndex(); //uint32 effIndex = triggeredByAura->GetEffIndex();
int32 triggerAmount = triggeredByAura->GetAmount(); //int32 triggerAmount = triggeredByAura->GetAmount();
Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER
? this->ToPlayer()->GetItemByGuid(triggeredByAura->GetBase()->GetCastItemGUID()) : NULL; ? 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); this->ToPlayer()->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
return true; 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 (); SpellEntry const *dummySpell = triggeredByAura->GetSpellProto ();
uint32 effIndex = triggeredByAura->GetEffIndex(); //uint32 effIndex = triggeredByAura->GetEffIndex();
int32 triggerAmount = triggeredByAura->GetAmount(); //int32 triggerAmount = triggeredByAura->GetAmount();
Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER
? this->ToPlayer()->GetItemByGuid(triggeredByAura->GetBase()->GetCastItemGUID()) : NULL; ? 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 // Used in case when access to whole aura is needed
// All procs should be handled like this... // 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(); SpellEntry const *dummySpell = triggeredByAura->GetSpellProto();
@@ -8411,7 +8411,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
return true; 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(); 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); 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; return true;
} }
@@ -12241,7 +12241,7 @@ int32 Unit::ApplyEffectModifiers(SpellEntry const* spellProto, uint8 effect_inde
return value; 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()); int32 level = int32(getLevel());
if (level > int32(spellProto->maxLevel) && spellProto->maxLevel > 0) if (level > int32(spellProto->maxLevel) && spellProto->maxLevel > 0)
src/game/UnitAI.cpp
+1 -1
View File
@@ -217,7 +217,7 @@ void UnitAI::DoCast(uint32 spellId)
{ {
const SpellEntry * spellInfo = GetSpellStore()->LookupEntry(spellId); const SpellEntry * spellInfo = GetSpellStore()->LookupEntry(spellId);
bool playerOnly = spellInfo->AttributesEx3 & SPELL_ATTR_EX3_PLAYERS_ONLY; 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); target = SelectTarget(SELECT_TARGET_RANDOM, 0, GetSpellMaxRange(spellInfo, false), playerOnly);
break; break;
} }
src/game/UnitAI.h
+5 -4
View File
@@ -47,7 +47,7 @@ class UnitAI
explicit UnitAI(Unit *u) : me(u) {} explicit UnitAI(Unit *u) : me(u) {}
virtual ~UnitAI() {} 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 AttackStart(Unit *);
virtual void UpdateAI(const uint32 diff) = 0; virtual void UpdateAI(const uint32 diff) = 0;
@@ -60,9 +60,9 @@ class UnitAI
// Pass parameters between AI // Pass parameters between AI
virtual void DoAction(const int32 param = 0) {} virtual void DoAction(const int32 param = 0) {}
virtual uint32 GetData(uint32 id = 0) { return 0; } virtual uint32 GetData(uint32 /*id = 0*/) { return 0; }
virtual void SetData(uint32 id, uint32 value) {} virtual void SetData(uint32 /*id*/, uint32 /*value*/) {}
virtual void SetGUID(const uint64 &guid, int32 id = 0) {} virtual void SetGUID(const uint64 &/*guid*/, int32 id = 0) {}
virtual uint64 GetGUID(int32 id = 0) { return 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); 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: public:
void UpdateAI(const uint32 diff); void UpdateAI(const uint32 diff);
SimpleCharmedAI(Player *p): PlayerAI(p) {}
}; };
#endif #endif
src/game/WaypointManager.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ void WaypointStore::Load()
return; return;
} }
WaypointPath* path_data; WaypointPath* path_data = NULL;
uint32 total_records = result->GetRowCount(); uint32 total_records = result->GetRowCount();
barGoLink bar(total_records); barGoLink bar(total_records);
src/game/WaypointMovementGenerator.cpp
+9 -9
View File
@@ -31,19 +31,19 @@
template<class T> template<class T>
void void
WaypointMovementGenerator<T>::Initialize(T &u){} WaypointMovementGenerator<T>::Initialize(T & /*u*/){}
template<> template<>
void void
WaypointMovementGenerator<Creature>::Finalize(Creature &u){} WaypointMovementGenerator<Creature>::Finalize(Creature & /*u*/){}
template<> template<>
void void
WaypointMovementGenerator<Player>::Finalize(Player &u){} WaypointMovementGenerator<Player>::Finalize(Player & /*u*/){}
template<class T> template<class T>
void void
WaypointMovementGenerator<T>::MovementInform(T &unit){} WaypointMovementGenerator<T>::MovementInform(T & /*unit*/){}
template<> template<>
void WaypointMovementGenerator<Creature>::MovementInform(Creature &unit) void WaypointMovementGenerator<Creature>::MovementInform(Creature &unit)
@@ -62,20 +62,20 @@ bool WaypointMovementGenerator<Creature>::GetDestination(float &x, float &y, flo
} }
template<> 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; return false;
} }
template<> template<>
void WaypointMovementGenerator<Creature>::Reset(Creature &unit) void WaypointMovementGenerator<Creature>::Reset(Creature & /*unit*/unit)
{ {
StopedByPlayer = true; StopedByPlayer = true;
i_nextMoveTime.Reset(0); i_nextMoveTime.Reset(0);
} }
template<> template<>
void WaypointMovementGenerator<Player>::Reset(Player &unit){} void WaypointMovementGenerator<Player>::Reset(Player & /*unit*/){}
template<> template<>
void WaypointMovementGenerator<Creature>::InitTraveller(Creature &unit, const WaypointData &node) void WaypointMovementGenerator<Creature>::InitTraveller(Creature &unit, const WaypointData &node)
@@ -122,11 +122,11 @@ WaypointMovementGenerator<Creature>::Initialize(Creature &u)
} }
template<> template<>
void WaypointMovementGenerator<Player>::InitTraveller(Player &unit, const WaypointData &node){} void WaypointMovementGenerator<Player>::InitTraveller(Player & /*unit*/, const WaypointData & /*node*/){}
template<class T> template<class T>
bool bool
WaypointMovementGenerator<T>::Update(T &unit, const uint32 &diff) WaypointMovementGenerator<T>::Update(T & /*unit*/, const uint32 & /*diff*/)
{ {
return false; return false;
} }
src/game/World.cpp
+3 -3
View File
@@ -1913,8 +1913,8 @@ void World::Update(uint32 diff)
{ {
if (m_timers[WUPDATE_CLEANDB].Passed()) if (m_timers[WUPDATE_CLEANDB].Passed())
{ {
uint32 tmpDiff = (m_gameTime - m_startTime); //uint32 tmpDiff = (m_gameTime - m_startTime);
uint32 maxClientsNum = sWorld.GetMaxActiveSessionCount(); //uint32 maxClientsNum = sWorld.GetMaxActiveSessionCount();
m_timers[WUPDATE_CLEANDB].Reset(); m_timers[WUPDATE_CLEANDB].Reset();
loginDatabase.PExecute("DELETE FROM logs WHERE (time + %u) < "UI64FMTD";", 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)); 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; m_playerLimit = limit;
} }
src/game/WorldSession.cpp
+2 -1
View File
@@ -252,10 +252,11 @@ bool WorldSession::Update(uint32 /*diff*/)
LogUnprocessedTail(packet); LogUnprocessedTail(packet);
break; break;
case STATUS_NEVER: case STATUS_NEVER:
break; /*
sLog.outError("SESSION: received not allowed opcode %s (0x%.4X)", sLog.outError("SESSION: received not allowed opcode %s (0x%.4X)",
LookupOpcodeName(packet->GetOpcode()), LookupOpcodeName(packet->GetOpcode()),
packet->GetOpcode()); packet->GetOpcode());
*/
break; break;
} }
} }
src/game/ZoneScript.h
+5 -5
View File
@@ -31,11 +31,11 @@ class ZoneScript
public: public:
explicit ZoneScript() {} explicit ZoneScript() {}
virtual uint32 GetCreatureEntry(uint32 guidlow, const CreatureData *data) { return data->id; } virtual uint32 GetCreatureEntry(uint32 /*guidlow*/, const CreatureData *data) { return data->id; }
virtual uint32 GetGameObjectEntry(uint32 guidlow, uint32 entry) { return entry; } virtual uint32 GetGameObjectEntry(uint32 /*guidlow*/, uint32 entry) { return entry; }
virtual void OnCreatureCreate(Creature *, bool add) {} virtual void OnCreatureCreate(Creature *, bool /*add*/) {}
virtual void OnGameObjectCreate(GameObject *go, bool add) {} virtual void OnGameObjectCreate(GameObject * /*go*/, bool /*add*/) {}
//All-purpose data storage 64 bit //All-purpose data storage 64 bit
virtual uint64 GetData64(uint32 /*DataId*/) { return 0; } virtual uint64 GetData64(uint32 /*DataId*/) { return 0; }
@@ -45,7 +45,7 @@ class ZoneScript
virtual uint32 GetData(uint32 /*DataId*/) { return 0; } virtual uint32 GetData(uint32 /*DataId*/) { return 0; }
virtual void SetData(uint32 /*DataId*/, uint32 /*Value*/) {} virtual void SetData(uint32 /*DataId*/, uint32 /*Value*/) {}
virtual void ProcessEvent(GameObject *obj, uint32 eventId) {} virtual void ProcessEvent(GameObject * /*obj*/, uint32 /*eventId*/) {}
}; };
#endif #endif
src/scripts/custom/npc_acherus_taxi.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ bool GossipHello_npc_acherus_taxi(Player *pPlayer, Creature *pCreature)
return true; 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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{ {
src/scripts/custom/npc_wyrmresttempel_taxi.cpp
+3 -3
View File
@@ -19,7 +19,7 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DOWN, GOSSIP_SENDER_MAIN, GOSS
return true; 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) 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; 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) 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; 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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 5)
{ {
src/scripts/custom/on_events.cpp
+12 -12
View File
@@ -2,67 +2,67 @@
#include <cstring> #include <cstring>
//This function is called when the player logs in (every login) //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 //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 //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 //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) //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 //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; return amount;
} }
//This function is called whenever a player gets XP //This function is called whenever a player gets XP
uint32 OnGetXP(Player *pPlayer, uint32 amount) uint32 OnGetXP(Player * /*pPlayer*/, uint32 amount)
{ {
return amount; return amount;
} }
//This function is called when a player clicks a GO Object //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; return true;
} }
//This function is called when a player clicks and item //This function is called when a player clicks and item
bool OnItemClick(Player *pPlayer, Item *pItem) bool OnItemClick(Player * /*pPlayer*/, Item * /*pItem*/)
{ {
return true; return true;
} }
//This function is called when a player opens an item (like a clam) //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; return true;
} }
//This function is called when a player sends a chat message //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; return true;
} }
@@ -79,7 +79,7 @@ void OnServerShutdown()
} }
//this function is called when a player casts a spell //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; return true;
} }
src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp
+2 -2
View File
@@ -103,7 +103,7 @@ struct boss_balindaAI : public ScriptedAI
Summons.DespawnAll(); Summons.DespawnAll();
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
DoScriptText(YELL_AGGRO, me); DoScriptText(YELL_AGGRO, me);
} }
@@ -121,7 +121,7 @@ struct boss_balindaAI : public ScriptedAI
Summons.Summon(summoned); Summons.Summon(summoned);
} }
void JustDied(Unit* Killer) void JustDied(Unit* /*Killer*/)
{ {
Summons.DespawnAll(); Summons.DespawnAll();
} }
src/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ struct boss_drektharAI : public ScriptedAI
uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); //20 to 30 seconds uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); //20 to 30 seconds
} }
void Aggro(Unit *who) void Aggro(Unit * /*who*/)
{ {
DoScriptText(YELL_AGGRO, me); DoScriptText(YELL_AGGRO, me);
} }
src/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ struct boss_galvangarAI : public ScriptedAI
uiResetTimer = 5*IN_MILISECONDS; uiResetTimer = 5*IN_MILISECONDS;
} }
void Aggro(Unit *who) void Aggro(Unit * /*who*/)
{ {
DoScriptText(YELL_AGGRO, me); DoScriptText(YELL_AGGRO, me);
} }
src/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ struct boss_vanndarAI : public ScriptedAI
uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
} }
void Aggro(Unit *who) void Aggro(Unit * /*who*/)
{ {
DoScriptText(YELL_AGGRO, me); DoScriptText(YELL_AGGRO, me);
} }
src/scripts/eastern_kingdoms/arathi_highlands.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ struct npc_professor_phizzlethorpeAI : public npc_escortAI
pSummoned->AI()->AttackStart(me); pSummoned->AI()->AttackStart(me);
} }
void EnterCombat(Unit* pWho) void EnterCombat(Unit* /*pWho*/)
{ {
DoScriptText(SAY_AGGRO, me); DoScriptText(SAY_AGGRO, me);
} }
src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
+5 -5
View File
@@ -44,7 +44,7 @@ EndContentData */
+## go_shadowforge_brazier +## 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()) if (ScriptedInstance* pInstance = pGo->GetInstanceData())
{ {
@@ -94,7 +94,7 @@ uint32 RingBoss[]=
9032, // Hedrum 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()) if (ScriptedInstance* pInstance = pPlayer->GetInstanceData())
{ {
@@ -451,7 +451,7 @@ bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature)
return true; 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) switch (uiAction)
{ {
@@ -545,7 +545,7 @@ bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature)
return true; 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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{ {
@@ -1235,7 +1235,7 @@ CreatureAI* GetAI_npc_rocknot(Creature* pCreature)
return new npc_rocknotAI(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(); ScriptedInstance* pInstance = pCreature->GetInstanceData();
src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ struct boss_ambassador_flamelashAI : public ScriptedAI
Spirit_Timer = 24000; Spirit_Timer = 24000;
} }
void EnterCombat(Unit *who) {} void EnterCombat(Unit * /*who*/) {}
void SummonSpirits(Unit* victim) void SummonSpirits(Unit* victim)
{ {
src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ struct boss_anubshiahAI : public ScriptedAI
EnvelopingWeb_Timer = 16000; EnvelopingWeb_Timer = 16000;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
+2 -2
View File
@@ -50,13 +50,13 @@ struct boss_draganthaurissanAI : public ScriptedAI
//Counter= 0; //Counter= 0;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
DoScriptText(SAY_AGGRO, me); DoScriptText(SAY_AGGRO, me);
me->CallForHelp(VISIBLE_RANGE); me->CallForHelp(VISIBLE_RANGE);
} }
void KilledUnit(Unit* victim) void KilledUnit(Unit* /*victim*/)
{ {
DoScriptText(SAY_SLAY, me); DoScriptText(SAY_SLAY, me);
} }
src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ struct boss_general_angerforgeAI : public ScriptedAI
Medics = false; Medics = false;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ struct boss_gorosh_the_dervishAI : public ScriptedAI
MortalStrike_Timer = 22000; MortalStrike_Timer = 22000;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ struct boss_grizzleAI : public ScriptedAI
Frenzy_Timer =0; Frenzy_Timer =0;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ struct boss_high_interrogator_gerstahnAI : public ScriptedAI
ShadowShield_Timer = 8000; ShadowShield_Timer = 8000;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ struct boss_magmusAI : public ScriptedAI
WarStomp_Timer =0; WarStomp_Timer =0;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ struct boss_moira_bronzebeardAI : public ScriptedAI
Smite_Timer = 8000; Smite_Timer = 8000;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp
+4 -4
View File
@@ -57,7 +57,7 @@ bool GossipHello_boss_gloomrel(Player* pPlayer, Creature* pCreature)
return true; 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) switch (uiAction)
{ {
@@ -128,7 +128,7 @@ struct boss_doomrelAI : public ScriptedAI
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); 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); pInstance->SetData64(DATA_EVENSTARTER, 0);
} }
void JustDied(Unit *who) void JustDied(Unit * /*who*/)
{ {
if (pInstance) if (pInstance)
pInstance->SetData(DATA_GHOSTKILL, 1); pInstance->SetData(DATA_GHOSTKILL, 1);
@@ -213,7 +213,7 @@ bool GossipHello_boss_doomrel(Player* pPlayer, Creature* pCreature)
return true; 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) switch (uiAction)
{ {
src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
+2 -2
View File
@@ -151,7 +151,7 @@ struct instance_blackrock_depths : public ScriptedInstance
TombBossGUIDs[i] = 0; TombBossGUIDs[i] = 0;
} }
void OnCreatureCreate(Creature* pCreature, bool add) void OnCreatureCreate(Creature* pCreature, bool /*add*/)
{ {
switch(pCreature->GetEntry()) 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()) switch(pGo->GetEntry())
{ {
src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp
+3 -5
View File
@@ -31,15 +31,13 @@ struct npc_rookey_whelpAI : public ScriptedAI
ScriptedInstance* pInstance; ScriptedInstance* pInstance;
void JustDied(Unit *who) void JustDied(Unit * /*who*/)
{ {
if (pInstance) if (pInstance)
{
pInstance->SetData(WHELP_DEATH_COUNT, pInstance->GetData(WHELP_DEATH_COUNT)+1); pInstance->SetData(WHELP_DEATH_COUNT, pInstance->GetData(WHELP_DEATH_COUNT)+1);
}
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 /*diff*/)
{ {
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
@@ -53,7 +51,7 @@ CreatureAI* GetAI_rookey_whelp(Creature* pCreature)
return new npc_rookey_whelpAI(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; Position pos;
pPlayer->GetPosition(&pos); pPlayer->GetPosition(&pos);
src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ struct boss_drakkisathAI : public ScriptedAI
Thunderclap_Timer = 17000; Thunderclap_Timer = 17000;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ struct boss_gythAI : public ScriptedAI
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ struct boss_halyconAI : public ScriptedAI
Summoned = false; Summoned = false;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ struct boss_highlordomokkAI : public ScriptedAI
Slow_Timer = 24000; Slow_Timer = 24000;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }
src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp
+2 -2
View File
@@ -40,9 +40,9 @@ struct boss_mothersmolderwebAI : public ScriptedAI
MothersMilk_Timer = 10000; 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) if (me->GetHealth() <= damage)
DoCast(me, SPELL_SUMMON_SPIRE_SPIDERLING, true); DoCast(me, SPELL_SUMMON_SPIRE_SPIDERLING, true);
src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ struct boss_overlordwyrmthalakAI : public ScriptedAI
Summoned = false; Summoned = false;
} }
void EnterCombat(Unit *who) void EnterCombat(Unit * /*who*/)
{ {
} }

Some files were not shown because too many files have changed in this diff Show More