* Rename: BattleGround -> Battleground.
--HG-- branch : trunk
This commit is contained in:
@@ -816,7 +816,7 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
|
||||
|
||||
Map* pMap = m_session->GetPlayer()->GetMap();
|
||||
|
||||
if (pMap->IsBattleGroundOrArena())
|
||||
if (pMap->IsBattlegroundOrArena())
|
||||
{
|
||||
// only allow if gm mode is on
|
||||
if (!_player->isGameMaster())
|
||||
@@ -826,7 +826,7 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
|
||||
return false;
|
||||
}
|
||||
// if both players are in different bgs
|
||||
else if (target->GetBattleGroundId() && m_session->GetPlayer()->GetBattleGroundId() != target->GetBattleGroundId())
|
||||
else if (target->GetBattlegroundId() && m_session->GetPlayer()->GetBattlegroundId() != target->GetBattlegroundId())
|
||||
{
|
||||
target->LeaveBattleground(false); // Note: should be changed so target gets no Deserter debuff
|
||||
//PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG,nameLink.c_str());
|
||||
@@ -835,10 +835,10 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
|
||||
}
|
||||
// all's well, set bg id
|
||||
// when porting out from the bg, it will be reset to 0
|
||||
target->SetBattleGroundId(m_session->GetPlayer()->GetBattleGroundId(), m_session->GetPlayer()->GetBattleGroundTypeId());
|
||||
target->SetBattlegroundId(m_session->GetPlayer()->GetBattlegroundId(), m_session->GetPlayer()->GetBattlegroundTypeId());
|
||||
// remember current position as entry point for return at bg end teleportation
|
||||
if (!target->GetMap()->IsBattleGroundOrArena())
|
||||
target->SetBattleGroundEntryPoint();
|
||||
if (!target->GetMap()->IsBattlegroundOrArena())
|
||||
target->SetBattlegroundEntryPoint();
|
||||
}
|
||||
else if (pMap->IsDungeon())
|
||||
{
|
||||
@@ -933,7 +933,7 @@ bool ChatHandler::HandleGonameCommand(const char* args)
|
||||
std::string chrNameLink = playerLink(target_name);
|
||||
|
||||
Map* cMap = target->GetMap();
|
||||
if (cMap->IsBattleGroundOrArena())
|
||||
if (cMap->IsBattlegroundOrArena())
|
||||
{
|
||||
// only allow if gm mode is on
|
||||
if (!_player->isGameMaster())
|
||||
@@ -943,7 +943,7 @@ bool ChatHandler::HandleGonameCommand(const char* args)
|
||||
return false;
|
||||
}
|
||||
// if both players are in different bgs
|
||||
else if (_player->GetBattleGroundId() && _player->GetBattleGroundId() != target->GetBattleGroundId())
|
||||
else if (_player->GetBattlegroundId() && _player->GetBattlegroundId() != target->GetBattlegroundId())
|
||||
{
|
||||
_player->LeaveBattleground(false); // Note: should be changed so _player gets no Deserter debuff
|
||||
//PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG,chrNameLink.c_str());
|
||||
@@ -952,10 +952,10 @@ bool ChatHandler::HandleGonameCommand(const char* args)
|
||||
}
|
||||
// all's well, set bg id
|
||||
// when porting out from the bg, it will be reset to 0
|
||||
_player->SetBattleGroundId(target->GetBattleGroundId(), target->GetBattleGroundTypeId());
|
||||
_player->SetBattlegroundId(target->GetBattlegroundId(), target->GetBattlegroundTypeId());
|
||||
// remember current position as entry point for return at bg end teleportation
|
||||
if (!_player->GetMap()->IsBattleGroundOrArena())
|
||||
_player->SetBattleGroundEntryPoint();
|
||||
if (!_player->GetMap()->IsBattlegroundOrArena())
|
||||
_player->SetBattlegroundEntryPoint();
|
||||
}
|
||||
else if (cMap->IsDungeon())
|
||||
{
|
||||
@@ -2214,7 +2214,7 @@ bool ChatHandler::HandleTeleCommand(const char * args)
|
||||
}
|
||||
|
||||
MapEntry const * me = sMapStore.LookupEntry(tele->mapId);
|
||||
if (!me || me->IsBattleGroundOrArena())
|
||||
if (!me || me->IsBattlegroundOrArena())
|
||||
{
|
||||
SendSysMessage(LANG_CANNOT_TELE_TO_BG);
|
||||
SetSentErrorMessage(true);
|
||||
@@ -2454,7 +2454,7 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
|
||||
}
|
||||
|
||||
/* MapEntry const * me = sMapStore.LookupEntry(tele->mapId);
|
||||
if (!me || me->IsBattleGroundOrArena())
|
||||
if (!me || me->IsBattlegroundOrArena())
|
||||
{
|
||||
SendSysMessage(LANG_CANNOT_TELE_TO_BG);
|
||||
SetSentErrorMessage(true);
|
||||
@@ -2538,7 +2538,7 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args)
|
||||
}
|
||||
|
||||
MapEntry const * me = sMapStore.LookupEntry(tele->mapId);
|
||||
if (!me || me->IsBattleGroundOrArena())
|
||||
if (!me || me->IsBattlegroundOrArena())
|
||||
{
|
||||
SendSysMessage(LANG_CANNOT_TELE_TO_BG);
|
||||
SetSentErrorMessage(true);
|
||||
|
||||
Reference in New Issue
Block a user