diff options
| -rwxr-xr-x | src/server/game/AI/CoreAI/UnitAI.h | 14 | ||||
| -rwxr-xr-x | src/server/game/Texts/CreatureTextMgr.cpp | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index cb4f5c4843b..35a45c51f5a 100755 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -152,13 +152,13 @@ class UnitAI static AISpellInfoType *AISpellInfo; static void FillAISpellInfo(); - virtual void sGossipHello(Player* player){ } - virtual void sGossipSelect(Player* player, uint32 sender, uint32 action){ } - virtual void sGossipSelectCode(Player* player, uint32 sender, uint32 action, const char* code){ } - virtual void sQuestAccept(Player* player, Quest const* quest){ } - virtual void sQuestSelect(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 sGossipHello(Player* /*player*/) {} + virtual void sGossipSelect(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/) {} + virtual void sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) {} + virtual void sQuestAccept(Player* /*player*/, Quest const* /*quest*/) {} + virtual void sQuestSelect(Player* /*player*/, Quest const* /*quest*/) {} + virtual void sQuestComplete(Player* /*player*/, Quest const* /*quest*/) {} + virtual void sQuestReward(Player* /*player*/, Quest const* /*quest*/, uint32 /*opt*/) {} }; class PlayerAI : public UnitAI diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index fe0cf904f94..d3f61d28da1 100755 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -357,7 +357,7 @@ void CreatureTextMgr::SendChatPacket(WorldPacket *data, WorldObject* source, Cha uint32 areaId = source->GetAreaId(); Map::PlayerList const& pList = source->GetMap()->GetPlayers(); 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 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(); Map::PlayerList const& pList = source->GetMap()->GetPlayers(); 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 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 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); } } @@ -399,7 +399,7 @@ void CreatureTextMgr::SendChatPacket(WorldPacket *data, WorldObject* source, Cha { 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())); - 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); } } @@ -430,4 +430,4 @@ bool CreatureTextMgr::TextExist(uint32 sourceEntry, uint8 textGroup) return false; } return true; -}
\ No newline at end of file +} |