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

Jason's animation events. Also reworked entity-types system.

Browse Source 
This was SVN commit r2209.
This commit is contained in:
MarkT
2005-05-01 19:09:13 +00:00
parent 32e3ff0921
commit db168702df
79 changed files with 485 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ObjectBase.cpp
+6 -4
View File
@@ -159,7 +159,7 @@ bool CObjectBase::Load(const char* filename)
AT(file);
AT(name);
AT(speed);
AT(actionpos);
AT(event);
AT(attachpoint);
AT(actor);
AT(frequency);
@@ -220,10 +220,12 @@ bool CObjectBase::Load(const char* filename)
anim.m_Speed = CStr(ae.Value).ToInt() / 100.f;
if (anim.m_Speed <= 0.0) anim.m_Speed = 1.0f;
}
else if (ae.Name == at_actionpos)
else if (ae.Name == at_event)
{
anim.m_ActionPos = CStr(ae.Value).ToInt();
if (anim.m_ActionPos < 0) anim.m_ActionPos = 0;
anim.m_ActionPos = CStr(ae.Value).ToDouble();
if (anim.m_ActionPos < 0.0) anim.m_ActionPos = 0.0;
else if (anim.m_ActionPos > 100.0) anim.m_ActionPos = 1.0;
else if (anim.m_ActionPos > 1.0) anim.m_ActionPos /= 100.0;
}
else
; // unrecognised element