*[8465] Fixed exploit of z-axis described in http://getmangos.com/community/showthread.php?t=9652 Author: elecyb
Note: mostly just code cleanup, parts of this already seemed to be implemented, and some code that was updated in MaNGOS doesn't even exist in our code. --HG-- branch : trunk
This commit is contained in:
@@ -56,7 +56,7 @@ class TRINITY_DLL_DECL DestinationHolder
|
|||||||
uint32 StartTravel(TRAVELLER &traveller, bool sendMove = true);
|
uint32 StartTravel(TRAVELLER &traveller, bool sendMove = true);
|
||||||
void GetLocationNow(const Map * map, float &x, float &y, float &z, bool is3D = false) const;
|
void GetLocationNow(const Map * map, float &x, float &y, float &z, bool is3D = false) const;
|
||||||
void GetLocationNowNoMicroMovement(float &x, float &y, float &z) const; // For use without micro movement
|
void GetLocationNowNoMicroMovement(float &x, float &y, float &z) const; // For use without micro movement
|
||||||
float GetDistance2dFromDestSq(const WorldObject &obj) const;
|
float GetDistance3dFromDestSq(const WorldObject &obj) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void _findOffSetPoint(float x1, float y1, float x2, float y2, float offset, float &x, float &y);
|
void _findOffSetPoint(float x1, float y1, float x2, float y2, float offset, float &x, float &y);
|
||||||
|
|||||||
@@ -188,11 +188,11 @@ DestinationHolder<TRAVELLER>::GetLocationNow(const Map * map, float &x, float &y
|
|||||||
|
|
||||||
template<typename TRAVELLER>
|
template<typename TRAVELLER>
|
||||||
float
|
float
|
||||||
DestinationHolder<TRAVELLER>::GetDistance2dFromDestSq(const WorldObject &obj) const
|
DestinationHolder<TRAVELLER>::GetDistance3dFromDestSq(const WorldObject &obj) const
|
||||||
{
|
{
|
||||||
float x,y,z;
|
float x,y,z;
|
||||||
obj.GetPosition(x,y,z);
|
obj.GetPosition(x,y,z);
|
||||||
return (i_destX-x)*(i_destX-x)+(i_destY-y)*(i_destY-y);
|
return (i_destX-x)*(i_destX-x)+(i_destY-y)*(i_destY-y)+(i_destZ-z)*(i_destZ-z);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename TRAVELLER>
|
template<typename TRAVELLER>
|
||||||
|
|||||||
Reference in New Issue
Block a user