[Build] Most errors fixed

This commit is contained in:
Antz 2015-02-07 22:46:39 +00:00 committed by Antz
parent 868302dd0b
commit 778052084e
70 changed files with 619 additions and 602 deletions

View file

@ -428,7 +428,7 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket& recv_data)
_player->SetBattleGroundEntryPoint();
// resurrect the player
if (!_player->isAlive())
if (!_player->IsAlive())
{
_player->ResurrectPlayer(1.0f);
_player->SpawnCorpseBones();
@ -491,7 +491,7 @@ void WorldSession::HandleLeaveBattlefieldOpcode(WorldPacket& recv_data)
DEBUG_LOG("WORLD: Received opcode CMSG_LEAVE_BATTLEFIELD");
// not allow leave battleground in combat
if (_player->isInCombat())
if (_player->IsInCombat())
if (BattleGround* bg = _player->GetBattleGround())
if (bg->GetStatus() != STATUS_WAIT_LEAVE)
return;