From 9e796f4e624c575b74518f9b29bd57f193c87336 Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Wed, 30 Mar 2016 11:38:45 +0300 Subject: MoveToWorld defaults to spawnpoint --- src/Entities/Entity.cpp | 20 +++++++++++++++++++- src/Entities/Entity.h | 4 ++-- 2 files changed, 21 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 169bcb4de..5dcef330a 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -1584,6 +1584,24 @@ bool cEntity::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d +bool cEntity::MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_NewPosition) +{ + return DoMoveToWorld(a_World, a_ShouldSendRespawn, a_NewPosition); +} + + + + + +bool cEntity::MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn) +{ + return MoveToWorld(a_World, a_ShouldSendRespawn, Vector3d(a_World->GetSpawnX(), a_World->GetSpawnY(), a_World->GetSpawnZ())); +} + + + + + bool cEntity::MoveToWorld(const AString & a_WorldName, bool a_ShouldSendRespawn) { cWorld * World = cRoot::Get()->GetWorld(a_WorldName); @@ -1593,7 +1611,7 @@ bool cEntity::MoveToWorld(const AString & a_WorldName, bool a_ShouldSendRespawn) return false; } - return DoMoveToWorld(World, a_ShouldSendRespawn, GetPosition()); + return DoMoveToWorld(World, a_ShouldSendRespawn, Vector3d(World->GetSpawnX(), World->GetSpawnY(), World->GetSpawnZ())); } diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 75c77e593..b00201f3a 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -406,10 +406,10 @@ public: /** Schedules a MoveToWorld call to occur on the next Tick of the entity */ void ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_SetPortalCooldown = false); - bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_NewPosition) { return DoMoveToWorld(a_World, a_ShouldSendRespawn, a_NewPosition); } + bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_NewPosition); /** Moves entity to specified world, taking a world pointer */ - bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn = true) { return MoveToWorld(a_World, a_ShouldSendRespawn, GetPosition()); } + bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn = true); /** Moves entity to specified world, taking a world name */ bool MoveToWorld(const AString & a_WorldName, bool a_ShouldSendRespawn = true); -- cgit v1.2.3