diff options
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 8e7c4762270..7bf2deff3e8 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -19453,20 +19453,24 @@ void Player::UpdateZoneDependentAuras( uint32 newZone ) } // Some spells applied at enter into zone (with subzones) - // Human Illusion - // NOTE: these are removed by RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CHANGE_MAP); - if ( newZone == 2367 ) // Old Hillsbrad Foothills - { - uint32 spellid = 0; - // all horde races - if( GetTeam() == HORDE ) - spellid = getGender() == GENDER_FEMALE ? 35481 : 35480; - // and some alliance races - else if( getRace() == RACE_NIGHTELF || getRace() == RACE_DRAENEI ) - spellid = getGender() == GENDER_FEMALE ? 35483 : 35482; - - if(spellid && !HasAura(spellid,0) ) - CastSpell(this,spellid,true); + switch(newZone) + { + case 2367: // Old Hillsbrad Foothills + { + // Human Illusion + // NOTE: these are removed by RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CHANGE_MAP); + uint32 spellid = 0; + // all horde races + if( GetTeam() == HORDE ) + spellid = getGender() == GENDER_FEMALE ? 35481 : 35480; + // and some alliance races + else if( getRace() == RACE_NIGHTELF || getRace() == RACE_DRAENEI ) + spellid = getGender() == GENDER_FEMALE ? 35483 : 35482; + + if(spellid && !HasAura(spellid,0) ) + CastSpell(this,spellid,true); + break; + } } } @@ -20185,11 +20189,11 @@ bool Player::IsAllowUseFlyMountsHere() const { case 0: case 1: - if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_AZEROTH)) + //if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_AZEROTH)) return false; break; case 530: - if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OUTLAND)) + //if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OUTLAND)) return false; break; case 571: @@ -20197,7 +20201,7 @@ bool Player::IsAllowUseFlyMountsHere() const return false; break; default: - if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OTHERS)) + //if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OTHERS)) return false; break; } |