diff options
| author | megamage <none@none> | 2009-08-23 22:09:43 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-08-23 22:09:43 -0500 |
| commit | 1ee90e1022a235859316e55356ea8a3d2f456c9b (patch) | |
| tree | b3db14f5e81ac865bb3fe92158b8837eb9b0ca5f /src/game/TemporarySummon.cpp | |
| parent | e71f5e474e2d935f2bfd8520dbf62a6f4b552a18 (diff) | |
*Update vehicle system. Make vehicle a seperate class from creature.
--HG--
branch : trunk
Diffstat (limited to 'src/game/TemporarySummon.cpp')
| -rw-r--r-- | src/game/TemporarySummon.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp index 70d55cc55fb..ab7ebbcca3e 100644 --- a/src/game/TemporarySummon.cpp +++ b/src/game/TemporarySummon.cpp @@ -29,7 +29,7 @@ Creature(), m_type(TEMPSUMMON_MANUAL_DESPAWN), m_timer(0), m_lifetime(0) , m_Properties(properties) { m_summonerGUID = owner ? owner->GetGUID() : 0; - m_summonMask |= SUMMON_MASK_SUMMON; + m_unitTypeMask |= UNIT_MASK_SUMMON; } Unit* TempSummon::GetSummoner() const @@ -271,7 +271,7 @@ Minion::Minion(SummonPropertiesEntry const *properties, Unit *owner) : TempSummo , m_owner(owner) { assert(m_owner); - m_summonMask |= SUMMON_MASK_MINION; + m_unitTypeMask |= UNIT_MASK_MINION; m_followAngle = PET_FOLLOW_ANGLE; } @@ -309,10 +309,10 @@ void Minion::RemoveFromWorld() Guardian::Guardian(SummonPropertiesEntry const *properties, Unit *owner) : Minion(properties, owner) , m_bonusdamage(0) { - m_summonMask |= SUMMON_MASK_GUARDIAN; + m_unitTypeMask |= UNIT_MASK_GUARDIAN; if (properties && properties->Type == SUMMON_TYPE_PET) { - m_summonMask |= SUMMON_MASK_CONTROLABLE_GUARDIAN; + m_unitTypeMask |= UNIT_MASK_CONTROLABLE_GUARDIAN; InitCharmInfo(); } } @@ -323,7 +323,7 @@ void Guardian::InitStats(uint32 duration) InitStatsForLevel(m_owner->getLevel()); - if(m_owner->GetTypeId() == TYPEID_PLAYER && HasSummonMask(SUMMON_MASK_CONTROLABLE_GUARDIAN)) + if(m_owner->GetTypeId() == TYPEID_PLAYER && HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) m_charmInfo->InitCharmCreateSpells(); SetReactState(REACT_AGGRESSIVE); @@ -333,7 +333,7 @@ Puppet::Puppet(SummonPropertiesEntry const *properties, Unit *owner) : Minion(pr { assert(owner->GetTypeId() == TYPEID_PLAYER); m_owner = (Player*)owner; - m_summonMask |= SUMMON_MASK_PUPPET; + m_unitTypeMask |= UNIT_MASK_PUPPET; } void Puppet::InitStats(uint32 duration) |