diff options
| author | megamage <none@none> | 2009-05-02 13:30:55 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-02 13:30:55 -0500 |
| commit | 9f0f239e60e2c7f0b8d36d1984f459102022164e (patch) | |
| tree | 45e7629371e903fdd429a1bf449c9c53bf46d9ec /src/game/SpellEffects.cpp | |
| parent | 8a05a5b91cf884c87c9ada5b0bd0ab872a3167e0 (diff) | |
| parent | f303ee08c5888170ad1509b89413af1e2a321f5c (diff) | |
*Merge.
*Also fix build in VC7 and VC8.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index f749da89711..33beae157d5 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2110,7 +2110,7 @@ void Spell::EffectTriggerSpell(uint32 i) bool instant = false; for(uint32 j = i+1; j < 3; ++j) { - if(m_spellInfo->Effect[j]==SPELL_EFFECT_INSTAKILL && m_spellInfo->EffectImplicitTargetA[j]==TARGET_SELF) + if(m_spellInfo->Effect[j]==SPELL_EFFECT_INSTAKILL && m_spellInfo->EffectImplicitTargetA[j]==TARGET_UNIT_CASTER) { instant = true; break; @@ -2153,7 +2153,7 @@ void Spell::EffectJump(uint32 i) // Init dest coordinates float x,y,z,o; - if(m_targets.HasDest()) + if(m_targets.HasDst()) { x = m_targets.m_destX; y = m_targets.m_destY; @@ -2210,7 +2210,7 @@ void Spell::EffectTeleportUnits(uint32 i) return; // If not exist data for dest location - return - if(!m_targets.HasDest()) + if(!m_targets.HasDst()) { sLog.outError( "Spell::EffectTeleportUnits - does not have destination for spell ID %u\n", m_spellInfo->Id ); return; @@ -2230,7 +2230,7 @@ void Spell::EffectTeleportUnits(uint32 i) else if(unitTarget->GetTypeId() == TYPEID_PLAYER) ((Player*)unitTarget)->TeleportTo(mapid, x, y, z, orientation, unitTarget==m_caster ? TELE_TO_SPELL : 0); - // post effects for TARGET_TABLE_X_Y_Z_COORDINATES + // post effects for TARGET_DST_DB switch ( m_spellInfo->Id ) { // Dimensional Ripper - Everlook @@ -5674,7 +5674,7 @@ void Spell::EffectMomentMove(uint32 i) if(unitTarget->isInFlight()) return; - if(!m_targets.HasDest()) + if(!m_targets.HasDst()) return; uint32 mapid = m_caster->GetMapId(); |