[10202] Rename isInFlight() to IsTaxiFlying() and UNIT_STAT_IN_FLIGHT to UNIT_STAT_TAXI_FLIGHT.

Also add IsFreeFlying() function to Player class.
This commit is contained in:
Lynx3d 2010-07-17 01:37:40 +02:00
parent e47e9a2218
commit 01d326b90d
25 changed files with 68 additions and 67 deletions

View file

@ -2731,7 +2731,7 @@ void Spell::EffectTriggerMissileSpell(SpellEffectIndex effect_idx)
void Spell::EffectJump(SpellEffectIndex eff_idx)
{
if(m_caster->isInFlight())
if(m_caster->IsTaxiFlying())
return;
// Init dest coordinates
@ -2780,7 +2780,7 @@ void Spell::EffectJump(SpellEffectIndex eff_idx)
void Spell::EffectTeleportUnits(SpellEffectIndex eff_idx)
{
if(!unitTarget || unitTarget->isInFlight())
if(!unitTarget || unitTarget->IsTaxiFlying())
return;
switch (m_spellInfo->EffectImplicitTargetB[eff_idx])
@ -4431,7 +4431,7 @@ void Spell::EffectTeleUnitsFaceCaster(SpellEffectIndex eff_idx)
if (!unitTarget)
return;
if (unitTarget->isInFlight())
if (unitTarget->IsTaxiFlying())
return;
float dis = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
@ -6664,7 +6664,7 @@ void Spell::EffectStuck(SpellEffectIndex /*eff_idx*/)
DEBUG_LOG("Spell Effect: Stuck");
DETAIL_LOG("Player %s (guid %u) used auto-unstuck future at map %u (%f, %f, %f)", pTarget->GetName(), pTarget->GetGUIDLow(), m_caster->GetMapId(), m_caster->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ());
if(pTarget->isInFlight())
if(pTarget->IsTaxiFlying())
return;
// homebind location is loaded always
@ -7067,7 +7067,7 @@ void Spell::EffectBlock(SpellEffectIndex /*eff_idx*/)
void Spell::EffectLeapForward(SpellEffectIndex eff_idx)
{
if(unitTarget->isInFlight())
if(unitTarget->IsTaxiFlying())
return;
if( m_spellInfo->rangeIndex == 1) //self range
@ -7095,7 +7095,7 @@ void Spell::EffectLeapForward(SpellEffectIndex eff_idx)
void Spell::EffectLeapBack(SpellEffectIndex eff_idx)
{
if(unitTarget->isInFlight())
if(unitTarget->IsTaxiFlying())
return;
m_caster->KnockBackFrom(unitTarget,float(m_spellInfo->EffectMiscValue[eff_idx])/10,float(damage)/10);