Fix build after last pull request merge.

This commit is contained in:
QAston
2011-08-24 19:36:20 +02:00
parent 7ae8f15985
commit fd500ba257
2 changed files with 2 additions and 3 deletions
+1 -1
View File
@@ -1247,7 +1247,7 @@ void Player::StopMirrorTimer(MirrorTimerType Type)
bool Player::IsImmuneToEnvironmentalDamage()
{
// check for GM and death state included in isAttackableByAOE
return (!isAttackableByAOE());
return (!isTargetableForAttack(false));
}
uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage)
+1 -2
View File
@@ -2247,6 +2247,7 @@ class Player : public Unit, public GridObject<Player>
/*** ENVIROMENTAL SYSTEM ***/
/*********************************************************/
bool IsImmuneToEnvironmentalDamage();
uint32 EnvironmentalDamage(EnviromentalDamage type, uint32 damage);
/*********************************************************/
@@ -2753,8 +2754,6 @@ class Player : public Unit, public GridObject<Player>
bool IsHasDelayedTeleport() const { return m_bHasDelayedTeleport; }
void SetDelayedTeleportFlag(bool setting) { m_bHasDelayedTeleport = setting; }
bool IsImmuneToEnvironmentalDamage();
void ScheduleDelayedOperation(uint32 operation)
{
if (operation < DELAYED_END)