From cf286ea9cdba3e9019eb6bc4816034070f6480be Mon Sep 17 00:00:00 2001 From: Kittnz Date: Sat, 25 Apr 2015 08:44:16 +0200 Subject: Scripts/Uldaman: Fix build & fix some movement suggested by josch --- .../scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp | 3 +-- .../scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp | 14 ++++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp index aa0bd69bb1c..7f0faa138ec 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp @@ -28,10 +28,9 @@ EndScriptData */ enum Ironaya { - SAY_AGGRO = 0, SPELL_ARCINGSMASH = 8374, SPELL_KNOCKAWAY = 10101, - SPELL_WSTOMP = 11876, + SPELL_WSTOMP = 11876 }; class boss_ironaya : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 3690107f711..b59c040d90b 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -40,15 +40,13 @@ enum Events EVENT_SUB_BOSS_AGGRO = 2228 }; -const float IronayaPoint[4] = { -231.228f, 246.6135f, -49.01617f, 0.0f }; - -enum StoneKeepers +enum IronayaTalk { - GUID_STONEKEEPER_1 = 27554, - GUID_STONEKEEPER_2 = 27794, - GUID_STONEKEEPER_3 = 28368 + SAY_AGGRO = 0 }; +const Position IronayaPoint = { -231.228f, 246.6135f, -49.01617f, 0.0f }; + class instance_uldaman : public InstanceMapScript { public: @@ -273,8 +271,8 @@ class instance_uldaman : public InstanceMapScript ironaya->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); ironaya->GetMotionMaster()->Clear(); - ironaya->GetMotionMaster()->MovePoint(0, IronayaPoint[0], IronayaPoint[1], IronayaPoint[2]); - ironaya->SetHomePosition(IronayaPoint[0], IronayaPoint[1], IronayaPoint[2], IronayaPoint[3]); + ironaya->GetMotionMaster()->MovePoint(0, IronayaPoint); + ironaya->SetHomePosition(IronayaPoint); ironaya->AI()->Talk(SAY_AGGRO); } -- cgit v1.2.3