From c17bf75cbbd76dc389039837539b2b20b16cdd70 Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Sun, 1 Jun 2014 19:06:58 +0000 Subject: [PATCH] Fix bad merge. This was SVN commit r15268. --- source/simulation2/components/CCmpPosition.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/source/simulation2/components/CCmpPosition.cpp b/source/simulation2/components/CCmpPosition.cpp index 5d061e4f20..6a1870cb98 100644 --- a/source/simulation2/components/CCmpPosition.cpp +++ b/source/simulation2/components/CCmpPosition.cpp @@ -254,6 +254,11 @@ public: UpdateXZRotation(); } + void Deserialized() + { + AdvertiseInterpolatedPositionChanges(); + } + virtual void UpdateTurretPosition() { if (m_TurretParent == INVALID_ENTITY) @@ -313,11 +318,6 @@ public: return m_TurretParent; } - void Deserialized() - { - AdvertiseInterpolatedPositionChanges(); - } - virtual bool IsInWorld() { return m_InWorld; @@ -363,6 +363,8 @@ public: // TurnTo will advertise the position changes TurnTo(ry); + + AdvertiseInterpolatedPositionChanges(); } virtual void JumpTo(entity_pos_t x, entity_pos_t z) @@ -378,7 +380,6 @@ public: AdvertisePositionChanges(); AdvertiseInterpolatedPositionChanges(); - AdvertiseInterpolatedPositionChanges(); } virtual void SetHeightOffset(entity_pos_t dy)