Use original taxipath data in taxi flight movement generator. Author: Vladimir
+ Cleanup --HG-- branch : trunk
This commit is contained in:
@@ -19363,30 +19363,30 @@ void Player::ContinueTaxiFlight()
|
||||
|
||||
float distPrev = MAP_SIZE*MAP_SIZE;
|
||||
float distNext =
|
||||
(nodeList[0]->x-GetPositionX())*(nodeList[0]->x-GetPositionX())+
|
||||
(nodeList[0]->y-GetPositionY())*(nodeList[0]->y-GetPositionY())+
|
||||
(nodeList[0]->z-GetPositionZ())*(nodeList[0]->z-GetPositionZ());
|
||||
(nodeList[0].x-GetPositionX())*(nodeList[0].x-GetPositionX())+
|
||||
(nodeList[0].y-GetPositionY())*(nodeList[0].y-GetPositionY())+
|
||||
(nodeList[0].z-GetPositionZ())*(nodeList[0].z-GetPositionZ());
|
||||
|
||||
for (uint32 i = 1; i < nodeList.size(); ++i)
|
||||
{
|
||||
TaxiPathNodeEntry const* node = nodeList[i];
|
||||
TaxiPathNodeEntry const* prevNode = nodeList[i-1];
|
||||
TaxiPathNodeEntry const& node = nodeList[i];
|
||||
TaxiPathNodeEntry const& prevNode = nodeList[i-1];
|
||||
|
||||
// skip nodes at another map
|
||||
if (node->mapid != GetMapId())
|
||||
if (node.mapid != GetMapId())
|
||||
continue;
|
||||
|
||||
distPrev = distNext;
|
||||
|
||||
distNext =
|
||||
(node->x-GetPositionX())*(node->x-GetPositionX())+
|
||||
(node->y-GetPositionY())*(node->y-GetPositionY())+
|
||||
(node->z-GetPositionZ())*(node->z-GetPositionZ());
|
||||
(node.x-GetPositionX())*(node.x-GetPositionX())+
|
||||
(node.y-GetPositionY())*(node.y-GetPositionY())+
|
||||
(node.z-GetPositionZ())*(node.z-GetPositionZ());
|
||||
|
||||
float distNodes =
|
||||
(node->x-prevNode->x)*(node->x-prevNode->x)+
|
||||
(node->y-prevNode->y)*(node->y-prevNode->y)+
|
||||
(node->z-prevNode->z)*(node->z-prevNode->z);
|
||||
(node.x-prevNode.x)*(node.x-prevNode.x)+
|
||||
(node.y-prevNode.y)*(node.y-prevNode.y)+
|
||||
(node.z-prevNode.z)*(node.z-prevNode.z);
|
||||
|
||||
if (distNext + distPrev < distNodes)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user