gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Remove m_NeedInitialXZRotation - not needed after changes to map loading order.

Browse Source 
This was SVN commit r15263.
This commit is contained in:
Ykkrosh
2014-06-01 18:10:00 +00:00
parent ceb3c3d366
commit b30a9a6384
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/components/CCmpPosition.cpp
+1 -18
View File
@@ -90,8 +90,6 @@ public:
float m_InterpolatedRotX, m_InterpolatedRotY, m_InterpolatedRotZ;
float m_LastInterpolatedRotX, m_LastInterpolatedRotZ; // not serialized
bool m_NeedInitialXZRotation;
static std::string GetSchema()
{
return
@@ -147,7 +145,6 @@ public:
m_LastInterpolatedRotX = m_LastInterpolatedRotZ = 0.f;
m_Territory = INVALID_PLAYER;
m_NeedInitialXZRotation = false;
m_TurretParent = INVALID_ENTITY;
m_TurretPosition = CFixedVector3D();
}
@@ -675,15 +672,6 @@ public:
UpdateXZRotation();
}
}
if (m_InWorld && m_NeedInitialXZRotation)
{
// the terrain probably wasn't loaded last time we tried, so update the XZ rotation without interpolation
UpdateXZRotation();
m_LastInterpolatedRotX = m_InterpolatedRotX;
m_LastInterpolatedRotZ = m_InterpolatedRotZ;
}
break;
}
@@ -771,8 +759,7 @@ private:
CmpPtr<ICmpTerrain> cmpTerrain(GetSystemEntity());
if (!cmpTerrain || !cmpTerrain->IsLoaded())
{
// try again when terrain is loaded
m_NeedInitialXZRotation = true;
LOGERROR(L"Terrain not loaded");
return;
}
@@ -792,10 +779,6 @@ private:
if (m_AnchorType == ROLL || m_AnchorType == PITCH_ROLL)
m_InterpolatedRotZ = atan2(normal.X, normal.Y);
m_NeedInitialXZRotation = false;
return;
}
};