diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/OutdoorPvP/OutdoorPvP.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/OutdoorPvP/OutdoorPvP.h | 4 | ||||
| -rwxr-xr-x | src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/OutdoorPvP/OutdoorPvPMgr.h | 2 | ||||
| -rwxr-xr-x | src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp | 2 | ||||
| -rwxr-xr-x | src/server/scripts/OutdoorPvP/OutdoorPvPZM.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index ff0f7af71d1..777087f6b1d 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -511,7 +511,7 @@ bool OutdoorPvP::HandleGossipOption(Player * plr, uint64 guid, uint32 id) return false; } -bool OutdoorPvP::CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso) +bool OutdoorPvP::CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso) { for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if (itr->second->CanTalkTo(plr, c, gso)) @@ -534,7 +534,7 @@ bool OPvPCapturePoint::HandleGossipOption(Player * /*plr*/, uint64 /*guid*/, uin return false; } -bool OPvPCapturePoint::CanTalkTo(Player * /*plr*/, Creature * /*c*/, GossipMenuItems /*gso*/) +bool OPvPCapturePoint::CanTalkTo(Player* /*plr*/, Creature* /*c*/, GossipMenuItems const& /*gso*/) { return false; } diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index f069dd04cf0..eac9f8a8a5f 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -125,7 +125,7 @@ class OPvPCapturePoint virtual bool HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid); - virtual bool CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso); + virtual bool CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso); virtual bool HandleDropFlag(Player * plr, uint32 spellId); @@ -245,7 +245,7 @@ class OutdoorPvP : public ZoneScript virtual bool HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid); - virtual bool CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso); + virtual bool CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso); void TeamApplyBuff(TeamId team, uint32 spellId, uint32 spellId2 = 0); diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp index dc03129c34e..78ce17aefc3 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -202,11 +202,11 @@ void OutdoorPvPMgr::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid } } -bool OutdoorPvPMgr::CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso) +bool OutdoorPvPMgr::CanTalkTo(Player* player, Creature* creature, GossipMenuItems const& gso) { for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { - if ((*itr)->CanTalkTo(plr, c, gso)) + if ((*itr)->CanTalkTo(player, creature, gso)) return true; } return false; diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h index 88997d3ff5c..ae3fe5ee32f 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h @@ -75,7 +75,7 @@ class OutdoorPvPMgr void HandleGossipOption(Player * player, uint64 guid, uint32 gossipid); - bool CanTalkTo(Player * player, Creature * creature, GossipMenuItems gso); + bool CanTalkTo(Player* player, Creature* creature, GossipMenuItems const& gso); void HandleDropFlag(Player * plr, uint32 spellId); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 1af7f602c0b..d46afadb483 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -326,7 +326,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) UpdateTowerState(); } -bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems /*gso*/) +bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems const& /*gso*/) { uint64 guid = c->GetGUID(); std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index fd0f772e8a5..a1ac4d4bbda 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -223,7 +223,7 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint bool HandleDropFlag(Player * plr, uint32 spellId); - bool CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso); + bool CanTalkTo(Player * plr, Creature * c, GossipMenuItems const& gso); private: |
