aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKittnz <frederik156@hotmail.com>2015-04-25 08:44:16 +0200
committerKittnz <frederik156@hotmail.com>2015-04-25 08:44:16 +0200
commitcf286ea9cdba3e9019eb6bc4816034070f6480be (patch)
treea2ba01d5912369cd79f404f737369a49131b505c
parent9cb4cb52d842d3611e3053c9bd46e1925283d14e (diff)
Scripts/Uldaman: Fix build & fix some movement suggested by josch
-rw-r--r--src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp3
-rw-r--r--src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp14
2 files changed, 7 insertions, 10 deletions
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);
}