Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Don't let the props inherit the 'idle' animation if the parent doesn't have the needed animation. Fixes #4071

Browse Source 
This was SVN commit r18568.
This commit is contained in:
sanderd17 2016-07-29 11:57:27 +00:00
parent 09ab4fe9d3
commit 51eb4b255c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/graphics/UnitAnimation.cpp
View File

@ -77,11 +77,11 @@ void CUnitAnimation::AddModel(CModel* model, const CObjectEntry* object)
// Recursively add all props
const std::vector<CModel::Prop>& props = model->GetProps();
for (std::vector<CModel::Prop>::const_iterator it = props.begin(); it != props.end(); ++it)
for (const CModel::Prop& prop : props)
{
CModel* propModel = it->m_Model->ToCModel();
CModel* propModel = prop.m_Model->ToCModel();
if (propModel)
AddModel(propModel, it->m_ObjectEntry);
AddModel(propModel, prop.m_ObjectEntry);
}
}
@ -237,9 +237,14 @@ void CUnitAnimation::Update(float time)
// we're handling the root model
// choose animations from the complete state
anim = it->object->GetRandomAnimation(m_State);
m_AnimationName = anim->m_Name;
// if we use a new animation name,
// update the animations of all non-root models
// sync with the root model, unless the root model could
// only resort to the "idle" state.
if (anim->m_Name != "idle")
m_AnimationName = anim->m_Name;
else
m_AnimationName = m_State;
if (it->anim->m_Name != m_AnimationName)
for (SModelAnimState animState : m_AnimStates)
if (animState.model != m_Model)