archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-13 23:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Filip Gawin
2019-08-02 17:43:40 +02:00
parent af5bd951ae
commit 458fc63f01
41 changed files with 1487 additions and 8021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/animation/AnimBlendAssociation.cpp
View File

@ -185,7 +185,7 @@ CAnimBlendAssociation::UpdateBlend(float timeDelta)
if(blendAmount <= 0.0f && blendDelta < 0.0f){
// We're faded out and are not fading in
blendAmount = 0.0f;
blendDelta = Max(0.0, blendDelta);
blendDelta = max(0.0, blendDelta);
if(flags & ASSOC_DELETEFADEDOUT){
if(callbackType == CB_FINISH || callbackType == CB_DELETE)
callback(this, callbackArg);
@ -197,7 +197,7 @@ CAnimBlendAssociation::UpdateBlend(float timeDelta)
if(blendAmount > 1.0f){
// Maximally faded in, clamp values
blendAmount = 1.0f;
blendDelta = Min(0.0, blendDelta);
blendDelta = min(0.0, blendDelta);
}
return true;

2
src/animation/AnimBlendHierarchy.cpp
View File

@ -36,7 +36,7 @@ CAnimBlendHierarchy::CalcTotalTime(void)
float seqTime = 0.0f;
for(j = 0; j < sequences[i].numFrames; j++)
seqTime += sequences[i].GetKeyFrame(j)->deltaTime;
totalTime = Max(totalTime, seqTime);
totalTime = max(totalTime, seqTime);
}
totalLength = totalTime;
}