mirror of
https://github.com/isledecomp/isle.git
synced 2026-01-24 08:41:16 +00:00
Fix order
This commit is contained in:
parent
d1aa7a29fc
commit
66651d217b
@ -21,14 +21,17 @@ RaceSkel::~RaceSkel()
|
|||||||
// Removing this empty destructor leads to a mismatch in RaceSkel::`scalar deleting destructor'
|
// Removing this empty destructor leads to a mismatch in RaceSkel::`scalar deleting destructor'
|
||||||
}
|
}
|
||||||
|
|
||||||
// FUNCTION: LEGO1 0x10071cb0
|
// FUNCTION: LEGO1 0x10071b50
|
||||||
// FUNCTION: BETA10 0x100f158b
|
// FUNCTION: BETA10 0x100f13cf
|
||||||
void RaceSkel::GetCurrentAnimData(float* p_outCurAnimPosition, float* p_outCurAnimDuration)
|
MxResult RaceSkel::FUN_1001c360(float p_und, Matrix4& p_transform)
|
||||||
{
|
{
|
||||||
*p_outCurAnimPosition = m_animPosition;
|
p_transform[3][0] = -630.0f;
|
||||||
|
p_transform[3][1] = -4.688f;
|
||||||
|
p_transform[3][2] = 323.0f;
|
||||||
|
|
||||||
assert(m_curAnim >= 0);
|
m_animPosition = p_und;
|
||||||
*p_outCurAnimDuration = m_animMaps[m_curAnim]->GetDuration();
|
|
||||||
|
return LegoAnimActor::FUN_1001c360(p_und, p_transform);
|
||||||
}
|
}
|
||||||
|
|
||||||
// FUNCTION: LEGO1 0x10071b90
|
// FUNCTION: LEGO1 0x10071b90
|
||||||
@ -48,15 +51,12 @@ void RaceSkel::ParseAction(char* p_extra)
|
|||||||
m_roi->SetBoundingSphere(sphere);
|
m_roi->SetBoundingSphere(sphere);
|
||||||
}
|
}
|
||||||
|
|
||||||
// FUNCTION: LEGO1 0x10071b50
|
// FUNCTION: LEGO1 0x10071cb0
|
||||||
// FUNCTION: BETA10 0x100f13cf
|
// FUNCTION: BETA10 0x100f158b
|
||||||
MxResult RaceSkel::FUN_1001c360(float p_und, Matrix4& p_transform)
|
void RaceSkel::GetCurrentAnimData(float* p_outCurAnimPosition, float* p_outCurAnimDuration)
|
||||||
{
|
{
|
||||||
p_transform[3][0] = -630.0f;
|
*p_outCurAnimPosition = m_animPosition;
|
||||||
p_transform[3][1] = -4.688f;
|
|
||||||
p_transform[3][2] = 323.0f;
|
|
||||||
|
|
||||||
m_animPosition = p_und;
|
assert(m_curAnim >= 0);
|
||||||
|
*p_outCurAnimDuration = m_animMaps[m_curAnim]->GetDuration();
|
||||||
return LegoAnimActor::FUN_1001c360(p_und, p_transform);
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user