Scripts: replaced various Location struct defines with proper Position or G3D::Vector3

1 files changed, 21 insertions, 29 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
index 8d23cf0a3e4..19b91b75dd4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
@@ -71,35 +71,27 @@ enum LieutenantDrake
     SPELL_FRIGHTENING_SHOUT = 33789
 };
 
-struct Location
+G3D::Vector3 const DrakeWP[]=
 {
-    uint32 wpId;
-    float x;
-    float y;
-    float z;
-};
-
-static Location DrakeWP[]=
-{
-    {0, 2125.84f, 88.2535f, 54.8830f},
-    {1, 2111.01f, 93.8022f, 52.6356f},
-    {2, 2106.70f, 114.753f, 53.1965f},
-    {3, 2107.76f, 138.746f, 52.5109f},
-    {4, 2114.83f, 160.142f, 52.4738f},
-    {5, 2125.24f, 178.909f, 52.7283f},
-    {6, 2151.02f, 208.901f, 53.1551f},
-    {7, 2177.00f, 233.069f, 52.4409f},
-    {8, 2190.71f, 227.831f, 53.2742f},
-    {9, 2178.14f, 214.219f, 53.0779f},
-    {10, 2154.99f, 202.795f, 52.6446f},
-    {11, 2132.00f, 191.834f, 52.5709f},
-    {12, 2117.59f, 166.708f, 52.7686f},
-    {13, 2093.61f, 139.441f, 52.7616f},
-    {14, 2086.29f, 104.950f, 52.9246f},
-    {15, 2094.23f, 81.2788f, 52.6946f},
-    {16, 2108.70f, 85.3075f, 53.3294f},
-    {17, 2125.50f, 88.9481f, 54.7953f},
-    {18, 2128.20f, 70.9763f, 64.4221f}
+    { 2125.84f, 88.2535f, 54.8830f },
+    { 2111.01f, 93.8022f, 52.6356f },
+    { 2106.70f, 114.753f, 53.1965f },
+    { 2107.76f, 138.746f, 52.5109f },
+    { 2114.83f, 160.142f, 52.4738f },
+    { 2125.24f, 178.909f, 52.7283f },
+    { 2151.02f, 208.901f, 53.1551f },
+    { 2177.00f, 233.069f, 52.4409f },
+    { 2190.71f, 227.831f, 53.2742f },
+    { 2178.14f, 214.219f, 53.0779f },
+    { 2154.99f, 202.795f, 52.6446f },
+    { 2132.00f, 191.834f, 52.5709f },
+    { 2117.59f, 166.708f, 52.7686f },
+    { 2093.61f, 139.441f, 52.7616f },
+    { 2086.29f, 104.950f, 52.9246f },
+    { 2094.23f, 81.2788f, 52.6946f },
+    { 2108.70f, 85.3075f, 53.3294f },
+    { 2125.50f, 88.9481f, 54.7953f },
+    { 2128.20f, 70.9763f, 64.4221f }
 };
 
 class boss_lieutenant_drake : public CreatureScript
@@ -163,7 +155,7 @@ public:
             /// @todo make this work
             if (CanPatrol && wpId == 0)
             {
-                me->GetMotionMaster()->MovePoint(DrakeWP[0].wpId, DrakeWP[0].x, DrakeWP[0].y, DrakeWP[0].z);
+                me->GetMotionMaster()->MovePoint(wpId, DrakeWP[wpId].x, DrakeWP[wpId].y, DrakeWP[wpId].z);
                 ++wpId;
             }