diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp | 2 | ||||
| -rw-r--r-- | src/game/Player.cpp | 5 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp index 4848813d727..9ec3ed4e1ac 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp @@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL mob_erekem_guardAI : public ScriptedAI if (uiLightningBoltTimer < diff) { - if (pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LIGHTNING_BOLT); uiLightningBoltTimer = urand(18000,24000); } else uiLightningBoltTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp index c952d2dc6a7..8bc82b6b40a 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp @@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI if (uiOpticLinkTimer < diff) { - if (pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget,SPELL_OPTIC_LINK); uiOpticLinkTimer = 15000; } else uiOpticLinkTimer -= diff; diff --git a/src/game/Player.cpp b/src/game/Player.cpp index e9634722fab..2d49a7559e9 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -22104,8 +22104,9 @@ void Player::ActivateSpec(uint8 spec) uint32 glyph = m_Glyphs[m_activeSpec][slot]; // apply primary glyph - if (glyph && GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph)) - CastSpell(this, gp->SpellId, true); + if (glyph) + if (GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph)) + CastSpell(this, gp->SpellId, true); SetGlyph(slot, glyph); } diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index b349182ecfc..ec132ee3e7b 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4138,7 +4138,7 @@ void Unit::RemoveAllAuras(uint64 casterGUID, Aura * except /*=NULL*/, bool negat AuraMap::iterator iter = m_Auras.begin(); while (!m_Auras.empty()) { - Aura * aur = (*iter)->GetParentAura(); + Aura * aur = (*iter).second; if (aur != except && (!casterGUID || aur->GetCasterGUID()==casterGUID) && ((negative && !aur->IsPositive()) || (positive && aur->IsPositive()))) RemoveAura(aur); |