mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-20 16:37:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Build] Most errors fixed

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

10
src/game/Object/ObjectMgr.cpp
View file

@ -8155,7 +8155,7 @@ bool PlayerCondition::Meets(Player const* player, Map const* map, WorldObject co
switch (m_value1)
{
case 0: // Player dead or out of range
return !player || !player->isAlive() || (m_value2 && source && !source->IsWithinDistInMap(player, m_value2));
return !player || !player->IsAlive() || (m_value2 && source && !source->IsWithinDistInMap(player, m_value2));
case 1: // All players in Group dead or out of range
if (!player)
return true;
@ -8164,23 +8164,23 @@ bool PlayerCondition::Meets(Player const* player, Map const* map, WorldObject co
for (GroupReference const* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
{
Player const* pl = itr->getSource();
if (pl && pl->isAlive() && !pl->isGameMaster() && (!m_value2 || !source || source->IsWithinDistInMap(pl, m_value2)))
if (pl && pl->IsAlive() && !pl->isGameMaster() && (!m_value2 || !source || source->IsWithinDistInMap(pl, m_value2)))
return false;
}
return true;
}
else
return !player->isAlive() || (m_value2 && source && !source->IsWithinDistInMap(player, m_value2));
return !player->IsAlive() || (m_value2 && source && !source->IsWithinDistInMap(player, m_value2));
case 2: // All players in instance dead or out of range
for (Map::PlayerList::const_iterator itr = map->GetPlayers().begin(); itr != map->GetPlayers().end(); ++itr)
{
Player const* plr = itr->getSource();
if (plr && plr->isAlive() && !plr->isGameMaster() && (!m_value2 || !source || source->IsWithinDistInMap(plr, m_value2)))
if (plr && plr->IsAlive() && !plr->isGameMaster() && (!m_value2 || !source || source->IsWithinDistInMap(plr, m_value2)))
return false;
}
return true;
case 3: // Creature source is dead
return !source || source->GetTypeId() != TYPEID_UNIT || !((Unit*)source)->isAlive();
return !source || source->GetTypeId() != TYPEID_UNIT || !((Unit*)source)->IsAlive();
}
default:
return false;