diff options
| author | megamage <none@none> | 2009-02-11 11:56:53 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-11 11:56:53 -0600 |
| commit | 651e7c29eb6b73489dd27d4f67c89bf539c8d68a (patch) | |
| tree | e2fce2c55e341e69161d4137bab7886f69cc5a12 /src/bindings/scripts | |
| parent | 757037ce543b5185946b6b3d89219156c78927f1 (diff) | |
| parent | 1ff96e6ac2f2b0a7c1e5a05f6f6143cf2ab25a06 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts')
3 files changed, 6 insertions, 4 deletions
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index 5b764367d06..4c796293aa3 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -1789,7 +1789,7 @@ struct TRINITY_DLL_DECL blade_of_azzinothAI : public NullCreatureAI void SpellHit(Unit *caster, const SpellEntry *spell) { if(spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE) - m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, 21431);//appear when hit by Illidan's glaive + me->SetUInt32Value(UNIT_FIELD_DISPLAYID, 21431);//appear when hit by Illidan's glaive } }; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp index ae3955ac6e2..7b772cbeb26 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp @@ -44,8 +44,8 @@ struct TRINITY_DLL_DECL molten_flameAI : public NullCreatureAI molten_flameAI(Creature *c) : NullCreatureAI(c) { float x, y, z; - m_creature->GetNearPoint(m_creature, x, y, z, 1, 50, M_PI*2*rand_norm()); - m_creature->GetMotionMaster()->MovePoint(0, x, y, z); + me->GetNearPoint(me, x, y, z, 1, 50, M_PI*2*rand_norm()); + me->GetMotionMaster()->MovePoint(0, x, y, z); } }; diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index 8db7477ea1e..eb929787f5f 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -1522,7 +1522,9 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI for(Group::member_citerator itr = members.begin(); itr!= members.end(); itr++) { GroupMember = ((Player*)Unit::GetUnit((*m_creature), itr->guid)); - if(GroupMember && !GroupMember->IsWithinDistInMap(m_creature, EVENT_AREA_RADIUS) && GroupMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_INCOMPLETE) + if(!GroupMember) + continue; + if(!GroupMember->IsWithinDistInMap(m_creature, EVENT_AREA_RADIUS) && GroupMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_INCOMPLETE) { GroupMember->FailQuest(QUEST_BATTLE_OF_THE_CRIMSON_WATCH); GroupMember->SetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, QUEST_STATUS_NONE); |