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

Removes usages of duplication of Clamp function in graphics. Refs D1763.

Browse Source 
This was SVN commit r22925.
This commit is contained in:
vladislavbelov
2019-09-18 08:34:36 +00:00
parent bdc6a7d3fd
commit 050f1dc8df
10 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ObjectBase.cpp
+3 -3
View File
@@ -173,11 +173,11 @@ void CObjectBase::LoadVariant(const CXeromyces& XeroFile, const XMBElement& vari
else if (ae.Name == at_speed)
anim.m_Speed = ae.Value.ToInt() > 0 ? ae.Value.ToInt() / 100.f : 1.f;
else if (ae.Name == at_event)
anim.m_ActionPos = clamp(ae.Value.ToFloat(), 0.f, 1.f);
anim.m_ActionPos = Clamp(ae.Value.ToFloat(), 0.f, 1.f);
else if (ae.Name == at_load)
anim.m_ActionPos2 = clamp(ae.Value.ToFloat(), 0.f, 1.f);
anim.m_ActionPos2 = Clamp(ae.Value.ToFloat(), 0.f, 1.f);
else if (ae.Name == at_sound)
anim.m_SoundPos = clamp(ae.Value.ToFloat(), 0.f, 1.f);
anim.m_SoundPos = Clamp(ae.Value.ToFloat(), 0.f, 1.f);
}
currentVariant.m_Anims.push_back(anim);
}