summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2019-08-27 20:50:59 +0200
committerFilip Gawin <filip.gawin@zoho.com>2019-08-27 22:29:23 +0200
commit01ac2929cd723b579454788ffbe9579d1863d240 (patch)
tree84f9f7df642f09a32adb1fa779ffeeb15fa2c206 /src/animation
parentMore more more audio (diff)
downloadre3-01ac2929cd723b579454788ffbe9579d1863d240.tar
re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.gz
re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.bz2
re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.lz
re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.xz
re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.zst
re3-01ac2929cd723b579454788ffbe9579d1863d240.zip
Diffstat (limited to 'src/animation')
-rw-r--r--src/animation/AnimBlendAssociation.cpp4
-rw-r--r--src/animation/AnimBlendHierarchy.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp
index d2214057..ec42191b 100644
--- a/src/animation/AnimBlendAssociation.cpp
+++ b/src/animation/AnimBlendAssociation.cpp
@@ -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.0f, blendDelta);
+ blendDelta = max(0.0f, 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.0f, blendDelta);
+ blendDelta = min(0.0f, blendDelta);
}
return true;
diff --git a/src/animation/AnimBlendHierarchy.cpp b/src/animation/AnimBlendHierarchy.cpp
index e594e5d8..e4bcdc69 100644
--- a/src/animation/AnimBlendHierarchy.cpp
+++ b/src/animation/AnimBlendHierarchy.cpp
@@ -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;
}