Core/Entities: Some changes to LoS z checking & MotionMaster::MoveJumpTo

This commit is contained in:
Ovahlord committed 2018-03-20 01:39:11 +01:00
1 parent 974521c6bf
commit 157719d4b0
8 files changed
+44 -44

No files matched your search

+10 -3
View File
@@ -1448,7 +1448,7 @@ bool WorldObject::IsWithinDistInMap(WorldObject const* obj, float dist2compare,
Position WorldObject::GetHitSpherePointFor(Position const& dest) const
{
G3D::Vector3 vThis(GetPositionX(), GetPositionY(), GetPositionZ());
G3D::Vector3 vThis(GetPositionX(), GetPositionY(), GetPositionZ() + GetMidsectionHeight());
G3D::Vector3 vObj(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ());
G3D::Vector3 contactPoint = vThis + (vObj - vThis).directionOrZero() * std::min(dest.GetExactDist(GetPosition()), GetObjectSize());
@@ -1461,11 +1461,14 @@ bool WorldObject::IsWithinLOS(float ox, float oy, float oz, LineOfSightChecks ch
{
float x, y, z;
if (GetTypeId() == TYPEID_PLAYER)
{
GetPosition(x, y, z);
z += GetMidsectionHeight();
}
else
GetHitSpherePointFor({ ox, oy, oz }, x, y, z);
return GetMap()->isInLineOfSight(GetPhaseShift(), x, y, z + 2.0f, ox, oy, oz + 2.0f, checks, ignoreFlags);
return GetMap()->isInLineOfSight(GetPhaseShift(), x, y, z, ox, oy, oz, checks, ignoreFlags);
}
return true;
@@ -1478,9 +1481,13 @@ bool WorldObject::IsWithinLOSInMap(const WorldObject* obj, LineOfSightChecks che
float x, y, z;
if (obj->GetTypeId() == TYPEID_PLAYER)
{
obj->GetPosition(x, y, z);
z += GetMidsectionHeight();
}
else
obj->GetHitSpherePointFor(GetPosition(), x, y, z);
obj->GetHitSpherePointFor({ GetPositionX(), GetPositionY(), GetPositionZ() + GetMidsectionHeight() }, x, y, z);
return IsWithinLOS(x, y, z, checks, ignoreFlags);
}