aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Transport/Transport.cpp65
1 files changed, 30 insertions, 35 deletions
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index e8bd59c247f..a8ac5bbb0b8 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -185,18 +185,13 @@ bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z,
struct keyFrame
{
- keyFrame(float _x, float _y, float _z, uint32 _mapid, int _actionflag, int _delay)
- {
- x = _x; y = _y; z = _z; mapid = _mapid; actionflag = _actionflag; delay = _delay; distFromPrev = -1; distSinceStop = -1; distUntilStop = -1;
- tFrom = 0; tTo = 0;
- }
+ explicit keyFrame(TaxiPathNodeEntry const& _node) : node(&_node),
+ distSinceStop(-1.0f), distUntilStop(-1.0f), distFromPrev(-1.0f), tFrom(0.0f), tTo(0.0f)
+ {
+ }
+
+ TaxiPathNodeEntry const* node;
- float x;
- float y;
- float z;
- uint32 mapid;
- int actionflag;
- int delay;
float distSinceStop;
float distUntilStop;
float distFromPrev;
@@ -220,9 +215,9 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
TaxiPathNodeEntry const& node_i = path[i];
if (node_i.mapid == path[i+1].mapid)
{
- keyFrame k(node_i.x, node_i.y, node_i.z, node_i.mapid, node_i.actionFlag, node_i.delay);
+ keyFrame k(node_i);
keyFrames.push_back(k);
- mapids.insert(k.mapid);
+ mapids.insert(k.node->mapid);
}
else
{
@@ -240,7 +235,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
// first cell is arrived at by teleportation :S
keyFrames[0].distFromPrev = 0;
- if (keyFrames[0].actionflag == 2)
+ if (keyFrames[0].node->actionFlag == 2)
{
lastStop = 0;
}
@@ -248,18 +243,18 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
// find the rest of the distances between key points
for (size_t i = 1; i < keyFrames.size(); ++i)
{
- if ((keyFrames[i].actionflag == 1) || (keyFrames[i].mapid != keyFrames[i-1].mapid))
+ if ((keyFrames[i].node->actionFlag == 1) || (keyFrames[i].node->mapid != keyFrames[i-1].node->mapid))
{
keyFrames[i].distFromPrev = 0;
}
else
{
keyFrames[i].distFromPrev =
- sqrt(pow(keyFrames[i].x - keyFrames[i - 1].x, 2) +
- pow(keyFrames[i].y - keyFrames[i - 1].y, 2) +
- pow(keyFrames[i].z - keyFrames[i - 1].z, 2));
+ sqrt(pow(keyFrames[i].node->x - keyFrames[i - 1].node->x, 2) +
+ pow(keyFrames[i].node->y - keyFrames[i - 1].node->y, 2) +
+ pow(keyFrames[i].node->z - keyFrames[i - 1].node->z, 2));
}
- if (keyFrames[i].actionflag == 2)
+ if (keyFrames[i].node->actionFlag == 2)
{
// remember first stop frame
if (firstStop == -1)
@@ -272,7 +267,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
for (size_t i = 0; i < keyFrames.size(); ++i)
{
int j = (i + lastStop) % keyFrames.size();
- if (keyFrames[j].actionflag == 2)
+ if (keyFrames[j].node->actionFlag == 2)
tmpDist = 0;
else
tmpDist += keyFrames[j].distFromPrev;
@@ -284,7 +279,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
int j = (i + (firstStop+1)) % keyFrames.size();
tmpDist += keyFrames[(j + 1) % keyFrames.size()].distFromPrev;
keyFrames[j].distUntilStop = tmpDist;
- if (keyFrames[j].actionflag == 2)
+ if (keyFrames[j].node->actionFlag == 2)
tmpDist = 0;
}
@@ -312,14 +307,14 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
// speed = max(30, t) (remember x = 0.5s^2, and when accelerating, a = 1 unit/s^2
int t = 0;
bool teleport = false;
- if (keyFrames[keyFrames.size() - 1].mapid != keyFrames[0].mapid)
+ if (keyFrames[keyFrames.size() - 1].node->mapid != keyFrames[0].node->mapid)
teleport = true;
- WayPoint pos(keyFrames[0].mapid, keyFrames[0].x, keyFrames[0].y, keyFrames[0].z, teleport, 0);
+ WayPoint pos(keyFrames[0].node->mapid, keyFrames[0].node->x, keyFrames[0].node->y, keyFrames[0].node->z, teleport, 0);
m_WayPoints[0] = pos;
- t += keyFrames[0].delay * 1000;
+ t += keyFrames[0].node->delay * 1000;
- uint32 cM = keyFrames[0].mapid;
+ uint32 cM = keyFrames[0].node->mapid;
for (size_t i = 0; i < keyFrames.size() - 1; ++i)
{
float d = 0;
@@ -337,19 +332,19 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
if (d > 0)
{
float newX, newY, newZ;
- newX = keyFrames[i].x + (keyFrames[i + 1].x - keyFrames[i].x) * d / keyFrames[i + 1].distFromPrev;
- newY = keyFrames[i].y + (keyFrames[i + 1].y - keyFrames[i].y) * d / keyFrames[i + 1].distFromPrev;
- newZ = keyFrames[i].z + (keyFrames[i + 1].z - keyFrames[i].z) * d / keyFrames[i + 1].distFromPrev;
+ newX = keyFrames[i].node->x + (keyFrames[i + 1].node->x - keyFrames[i].node->x) * d / keyFrames[i + 1].distFromPrev;
+ newY = keyFrames[i].node->y + (keyFrames[i + 1].node->y - keyFrames[i].node->y) * d / keyFrames[i + 1].distFromPrev;
+ newZ = keyFrames[i].node->z + (keyFrames[i + 1].node->z - keyFrames[i].node->z) * d / keyFrames[i + 1].distFromPrev;
bool teleport = false;
- if (keyFrames[i].mapid != cM)
+ if (keyFrames[i].node->mapid != cM)
{
teleport = true;
- cM = keyFrames[i].mapid;
+ cM = keyFrames[i].node->mapid;
}
// sLog.outString("T: %d, D: %f, x: %f, y: %f, z: %f", t, d, newX, newY, newZ);
- WayPoint pos(keyFrames[i].mapid, newX, newY, newZ, teleport, i);
+ WayPoint pos(keyFrames[i].node->mapid, newX, newY, newZ, teleport, 0);
if (teleport)
m_WayPoints[t] = pos;
}
@@ -389,13 +384,13 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
t += (long)keyFrames[i + 1].tTo % 100;
bool teleport = false;
- if ((keyFrames[i + 1].actionflag == 1) || (keyFrames[i + 1].mapid != keyFrames[i].mapid))
+ if ((keyFrames[i + 1].node->actionFlag == 1) || (keyFrames[i + 1].node->mapid != keyFrames[i].node->mapid))
{
teleport = true;
- cM = keyFrames[i + 1].mapid;
+ cM = keyFrames[i + 1].node->mapid;
}
- WayPoint pos(keyFrames[i + 1].mapid, keyFrames[i + 1].x, keyFrames[i + 1].y, keyFrames[i + 1].z, teleport, i);
+ WayPoint pos(keyFrames[i + 1].node->mapid, keyFrames[i + 1].node->x, keyFrames[i + 1].node->y, keyFrames[i + 1].node->z, teleport, 0);
// sLog.outString("T: %d, x: %f, y: %f, z: %f, t:%d", t, pos.x, pos.y, pos.z, teleport);
/*
@@ -405,7 +400,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
//if (teleport)
m_WayPoints[t] = pos;
- t += keyFrames[i + 1].delay * 1000;
+ t += keyFrames[i + 1].node->delay * 1000;
// sLog.outString("------");
}