From 2fabbc3b4cab40220986f402569af64673cb4cd9 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Fri, 16 Aug 2019 20:17:15 +0200
Subject: More more more audio

---
 src/animation/AnimBlendAssociation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/animation/AnimBlendAssociation.cpp')

diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp
index d94fe2c1..d2214057 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.0, 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.0, blendDelta);
+		blendDelta = Min(0.0f, blendDelta);
 	}
 
 	return true;
-- 
cgit v1.2.3