mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 03:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge.

Browse Source 
This was SVN commit r15268.
This commit is contained in:
Ykkrosh
2014-06-01 19:06:58 +00:00
parent fb0b4572ab
commit c17bf75cbb
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/components/CCmpPosition.cpp
+7 -6
View File
@@ -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)