AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 05:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Compile fixes, and initial asset name parser

Browse Source
This commit is contained in:
Phillip Stephens
2017-07-02 03:18:38 -07:00
parent 704e1b110a
commit 38a13868f0
21 changed files with 528 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Character/CAnimTreeTimeScale.cpp
View File

@@ -22,13 +22,13 @@ CCharAnimTime CAnimTreeTimeScale::GetRealLifeTime(const CCharAnimTime& time) con
if (x28_ > CCharAnimTime())
{
if (tmp < CCharAnimTime(x28_ * x20_))
return x18_timeScale->TimeScaleIntegral(x20_, x20_ + tmp);
return x18_timeScale->VTimeScaleIntegral(x20_, x20_ + tmp);
else
{
CCharAnimTime integral = x18_timeScale->TimeScaleIntegral(x20_, x28_);
CCharAnimTime integral = x18_timeScale->VTimeScaleIntegral(x20_, x28_);
if (integral > tmp)
return x18_timeScale->FindUpperLimit(x20_, tmp) * x20_;
return x18_timeScale->VFindUpperLimit(x20_, tmp) * x20_;
else
return integral + (integral * tmp);
}