Core: Fix some warnings added in recent commits
--HG-- branch : trunk
This commit is contained in:
@@ -152,13 +152,13 @@ class UnitAI
|
|||||||
static AISpellInfoType *AISpellInfo;
|
static AISpellInfoType *AISpellInfo;
|
||||||
static void FillAISpellInfo();
|
static void FillAISpellInfo();
|
||||||
|
|
||||||
virtual void sGossipHello(Player* player){ }
|
virtual void sGossipHello(Player* /*player*/) {}
|
||||||
virtual void sGossipSelect(Player* player, uint32 sender, uint32 action){ }
|
virtual void sGossipSelect(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/) {}
|
||||||
virtual void sGossipSelectCode(Player* player, uint32 sender, uint32 action, const char* code){ }
|
virtual void sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) {}
|
||||||
virtual void sQuestAccept(Player* player, Quest const* quest){ }
|
virtual void sQuestAccept(Player* /*player*/, Quest const* /*quest*/) {}
|
||||||
virtual void sQuestSelect(Player* player, Quest const* quest){ }
|
virtual void sQuestSelect(Player* /*player*/, Quest const* /*quest*/) {}
|
||||||
virtual void sQuestComplete(Player* player, Quest const* quest){ }
|
virtual void sQuestComplete(Player* /*player*/, Quest const* /*quest*/) {}
|
||||||
virtual void sQuestReward(Player* player, Quest const* quest, uint32 opt){ }
|
virtual void sQuestReward(Player* /*player*/, Quest const* /*quest*/, uint32 /*opt*/) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
class PlayerAI : public UnitAI
|
class PlayerAI : public UnitAI
|
||||||
|
|||||||
@@ -357,7 +357,7 @@ void CreatureTextMgr::SendChatPacket(WorldPacket *data, WorldObject* source, Cha
|
|||||||
uint32 areaId = source->GetAreaId();
|
uint32 areaId = source->GetAreaId();
|
||||||
Map::PlayerList const& pList = source->GetMap()->GetPlayers();
|
Map::PlayerList const& pList = source->GetMap()->GetPlayers();
|
||||||
for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
|
for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
|
||||||
if (itr->getSource()->GetAreaId() == areaId && (!team || (team && itr->getSource()->GetTeam() == team)) && (!gmOnly || itr->getSource()->isGameMaster()))
|
if (itr->getSource()->GetAreaId() == areaId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster()))
|
||||||
{
|
{
|
||||||
if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid
|
if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid
|
||||||
data->put<uint64>(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(itr->getSource()->GetGUID()));
|
data->put<uint64>(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(itr->getSource()->GetGUID()));
|
||||||
@@ -370,7 +370,7 @@ void CreatureTextMgr::SendChatPacket(WorldPacket *data, WorldObject* source, Cha
|
|||||||
uint32 zoneId = source->GetZoneId();
|
uint32 zoneId = source->GetZoneId();
|
||||||
Map::PlayerList const& pList = source->GetMap()->GetPlayers();
|
Map::PlayerList const& pList = source->GetMap()->GetPlayers();
|
||||||
for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
|
for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
|
||||||
if (itr->getSource()->GetZoneId() == zoneId && (!team || (team && itr->getSource()->GetTeam() == team)) && (!gmOnly || itr->getSource()->isGameMaster()))
|
if (itr->getSource()->GetZoneId() == zoneId && (!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster()))
|
||||||
{
|
{
|
||||||
if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid
|
if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid
|
||||||
data->put<uint64>(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(itr->getSource()->GetGUID()));
|
data->put<uint64>(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(itr->getSource()->GetGUID()));
|
||||||
@@ -385,7 +385,7 @@ void CreatureTextMgr::SendChatPacket(WorldPacket *data, WorldObject* source, Cha
|
|||||||
{
|
{
|
||||||
if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid
|
if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid
|
||||||
data->put<uint64>(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(itr->getSource()->GetGUID()));
|
data->put<uint64>(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(itr->getSource()->GetGUID()));
|
||||||
if (!team || (team && itr->getSource()->GetTeam() == team) && (!gmOnly || itr->getSource()->isGameMaster()))
|
if ((!team || Team(itr->getSource()->GetTeam()) == team) && (!gmOnly || itr->getSource()->isGameMaster()))
|
||||||
(itr->getSource())->GetSession()->SendPacket(data);
|
(itr->getSource())->GetSession()->SendPacket(data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -399,7 +399,7 @@ void CreatureTextMgr::SendChatPacket(WorldPacket *data, WorldObject* source, Cha
|
|||||||
{
|
{
|
||||||
if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid
|
if (data->GetOpcode() == SMSG_MESSAGECHAT)//override whisperguid with actual player's guid
|
||||||
data->put<uint64>(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(plr->GetGUID()));
|
data->put<uint64>(1+4+8+4+4+(int32)(strlen(source->GetName())+1), uint64(plr->GetGUID()));
|
||||||
if (plr->GetSession() && (!team || (team && plr->GetTeam() == team)) && (!gmOnly || plr->isGameMaster()))
|
if (plr->GetSession() && (!team || Team(plr->GetTeam()) == team) && (!gmOnly || plr->isGameMaster()))
|
||||||
plr->GetSession()->SendPacket(data);
|
plr->GetSession()->SendPacket(data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user