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

Try to fix issue with probably uninitialised animation frequency, improve error message and clean up code a bit

Browse Source 
This was SVN commit r18278.
This commit is contained in:
sanderd17
2016-06-01 07:21:50 +00:00
parent 8a8c0b526d
commit ff886b1773
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ObjectEntry.cpp
+14 -7
View File
@@ -159,12 +159,18 @@ bool CObjectEntry::BuildVariation(const std::vector<std::set<CStr> >& selections
{
CStr name = it->first.LowerCase();
if (!it->second.m_FileName.empty())
{
CSkeletonAnim* anim = model->BuildAnimation(it->second.m_FileName, name, it->second.m_Frequency, it->second.m_Speed, it->second.m_ActionPos, it->second.m_ActionPos2, it->second.m_SoundPos);
if (anim)
m_Animations.insert(std::make_pair(name, anim));
}
if (it->second.m_FileName.empty())
continue;
CSkeletonAnim* anim = model->BuildAnimation(
it->second.m_FileName,
name,
it->second.m_Frequency,
it->second.m_Speed,
it->second.m_ActionPos,
it->second.m_ActionPos2,
it->second.m_SoundPos);
if (anim)
m_Animations.insert(std::make_pair(name, anim));
}
// ensure there's always an idle animation
@@ -173,6 +179,7 @@ bool CObjectEntry::BuildVariation(const std::vector<std::set<CStr> >& selections
CSkeletonAnim* anim = new CSkeletonAnim();
anim->m_Name = "idle";
anim->m_AnimDef = NULL;
anim->m_Frequency = 0;
anim->m_Speed = 0.f;
anim->m_ActionPos = 0.f;
anim->m_ActionPos2 = 0.f;
@@ -264,7 +271,7 @@ CSkeletonAnim* CObjectEntry::GetRandomAnimation(const CStr& animationName) const
if (r < 0)
return anim;
}
LOGERROR("No animation found");
LOGERROR("No animation found for name %s", animationName);
return NULL;
}