Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Some update of spell target selection.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-23 00:46:21 -05:00
parent db066046df
commit b35fe879ad
11 changed files with 208 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/game/Object.cpp
View File

@@ -1196,7 +1196,7 @@ float WorldObject::GetDistance(float x, float y, float z) const
return ( dist > 0 ? dist : 0);
}
float WorldObject::GetDistanceSq(const float &x, const float &y, const float &z) const
float WorldObject::GetExactDistSq(float x, float y, float z) const
{
float dx = GetPositionX() - x;
float dy = GetPositionY() - y;
@@ -1204,7 +1204,14 @@ float WorldObject::GetDistanceSq(const float &x, const float &y, const float &z)
return dx*dx + dy*dy + dz*dz;
}
float WorldObject::GetDistanceSq(const WorldObject *obj) const
float WorldObject::GetDistance2dSq(float x, float y) const
{
float dx = GetPositionX() - x;
float dy = GetPositionY() - y;
return dx*dx + dy*dy;
}
float WorldObject::GetExactDistSq(const WorldObject *obj) const
{
float dx = GetPositionX() - obj->GetPositionX();
float dy = GetPositionY() - obj->GetPositionY();
@@ -1236,8 +1243,7 @@ bool WorldObject::IsWithinDist3d(float x, float y, float z, float dist2compare)
float dz = GetPositionZ() - z;
float distsq = dx*dx + dy*dy + dz*dz;
float sizefactor = GetObjectSize();
float maxdist = dist2compare + sizefactor;
float maxdist = dist2compare + GetObjectSize();
return distsq < maxdist * maxdist;
}
@@ -1248,8 +1254,7 @@ bool WorldObject::IsWithinDist2d(float x, float y, float dist2compare) const
float dy = GetPositionY() - y;
float distsq = dx*dx + dy*dy;
float sizefactor = GetObjectSize();
float maxdist = dist2compare + sizefactor;
float maxdist = dist2compare + GetObjectSize();
return distsq < maxdist * maxdist;
}