diff options
| author | win32 <none@none> | 2009-12-20 13:35:08 +0200 |
|---|---|---|
| committer | win32 <none@none> | 2009-12-20 13:35:08 +0200 |
| commit | 7c9f6b4bc37eec7b94aaba1cd8912bd5c0054e2a (patch) | |
| tree | 6dde39dad95c2ce3d688890082cd66d66abb878e /src/game/OutdoorPvPZM.cpp | |
| parent | 31c6b10a192671562f38f17f9e6270979ebe417c (diff) | |
Merge MaNGOS, Gossip System. Autor NoFantasy.
* DB support required
* Closes #859
--HG--
branch : trunk
Diffstat (limited to 'src/game/OutdoorPvPZM.cpp')
| -rw-r--r-- | src/game/OutdoorPvPZM.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/game/OutdoorPvPZM.cpp b/src/game/OutdoorPvPZM.cpp index 4f3f0a08a2c..7c67878f407 100644 --- a/src/game/OutdoorPvPZM.cpp +++ b/src/game/OutdoorPvPZM.cpp @@ -326,22 +326,16 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) UpdateTowerState(); } -bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipOption & gso) +bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso) { uint64 guid = c->GetGUID(); std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid); if(itr != m_CreatureTypes.end()) { if(itr->second == ZM_ALLIANCE_FIELD_SCOUT && plr->GetTeam() == ALLIANCE && m_BothControllingFaction == ALLIANCE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_A) - { - gso.OptionText.assign(objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_ZM_GOSSIP_ALLIANCE)); return true; - } else if(itr->second == ZM_HORDE_FIELD_SCOUT && plr->GetTeam() == HORDE && m_BothControllingFaction == HORDE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_H) - { - gso.OptionText.assign(objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_ZM_GOSSIP_HORDE)); return true; - } } return false; } |