Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Handlers/MiscHandler.cpp src/server/scripts/Commands/cs_reload.cpp
This commit is contained in:
commit
1390621f4d
66 files changed
+388
-332
No files matched your search
@@ -1727,11 +1727,11 @@ void WorldObject::GetRandomPoint(const Position &pos, float distance, float &ran
|
||||
UpdateGroundPositionZ(rand_x, rand_y, rand_z); // update to LOS height if available
|
||||
}
|
||||
|
||||
void WorldObject::GetRandomPoint(const Position &srcPos, float distance, Position &pos) const
|
||||
Position WorldObject::GetRandomPoint(const Position &srcPos, float distance) const
|
||||
{
|
||||
float x, y, z;
|
||||
GetRandomPoint(srcPos, distance, x, y, z);
|
||||
pos.Relocate(x, y, z, GetOrientation());
|
||||
return Position(x, y, z, GetOrientation());
|
||||
}
|
||||
|
||||
void WorldObject::UpdateGroundPositionZ(float x, float y, float &z) const
|
||||
@@ -2686,22 +2686,25 @@ void WorldObject::GetClosePoint(float &x, float &y, float &z, float size, float
|
||||
GetNearPoint(NULL, x, y, z, size, distance2d, GetOrientation() + angle);
|
||||
}
|
||||
|
||||
void WorldObject::GetNearPosition(Position &pos, float dist, float angle)
|
||||
Position WorldObject::GetNearPosition(float dist, float angle)
|
||||
{
|
||||
GetPosition(&pos);
|
||||
Position pos = GetPosition();
|
||||
MovePosition(pos, dist, angle);
|
||||
return pos;
|
||||
}
|
||||
|
||||
void WorldObject::GetFirstCollisionPosition(Position &pos, float dist, float angle)
|
||||
Position WorldObject::GetFirstCollisionPosition(float dist, float angle)
|
||||
{
|
||||
GetPosition(&pos);
|
||||
Position pos = GetPosition();
|
||||
MovePositionToFirstCollision(pos, dist, angle);
|
||||
return pos;
|
||||
}
|
||||
|
||||
void WorldObject::GetRandomNearPosition(Position &pos, float radius)
|
||||
Position WorldObject::GetRandomNearPosition(float radius)
|
||||
{
|
||||
GetPosition(&pos);
|
||||
Position pos = GetPosition();
|
||||
MovePosition(pos, radius * (float)rand_norm(), (float)rand_norm() * static_cast<float>(2 * M_PI));
|
||||
return pos;
|
||||
}
|
||||
|
||||
void WorldObject::GetContactPoint(const WorldObject* obj, float &x, float &y, float &z, float distance2d /*= CONTACT_DISTANCE*/) const
|
||||
|
||||
Reference in new issue
Block a user