aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/HomeMovementGenerator.cpp2
-rw-r--r--src/game/Object.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp
index a2bad0b0db7..805b4d51a3a 100644
--- a/src/game/HomeMovementGenerator.cpp
+++ b/src/game/HomeMovementGenerator.cpp
@@ -28,6 +28,8 @@
void
HomeMovementGenerator<Creature>::Initialize(Creature & owner)
{
+ float x, y, z;
+ owner.GetHomePosition(x, y, z, ori);
owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
_setTargetLocation(owner);
}
diff --git a/src/game/Object.h b/src/game/Object.h
index b5ac57b06ca..e6731db1712 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -383,7 +383,6 @@ class TRINITY_DLL_SPEC WorldObject : public Object
void Relocate(float x, float y, float z, float orientation)
{
- assert(orientation > -100 && orientation < 100);
m_positionX = x;
m_positionY = y;
m_positionZ = z;
@@ -403,7 +402,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object
Relocate(loc.x, loc.y, loc.z, loc.o);
}
- void SetOrientation(float orientation) { assert(orientation > -100 && orientation < 100); m_orientation = orientation; }
+ void SetOrientation(float orientation) { m_orientation = orientation; }
float GetPositionX( ) const { return m_positionX; }
float GetPositionY( ) const { return m_positionY; }