summaryrefslogtreecommitdiffstats
path: root/src/animation/AnimBlendAssociation.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-08 20:58:40 +0200
committeraap <aap@papnet.eu>2020-05-08 20:58:40 +0200
commitf12e76fa135db3ca0a98c441cc3f5c0a4a14549d (patch)
tree29774d79de544892972dd8b1e31b5404353dd1ca /src/animation/AnimBlendAssociation.cpp
parentsmall fixes (diff)
downloadre3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.gz
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.bz2
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.lz
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.xz
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.zst
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.zip
Diffstat (limited to '')
-rw-r--r--src/animation/AnimBlendAssociation.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp
index daca7d68..8c99b694 100644
--- a/src/animation/AnimBlendAssociation.cpp
+++ b/src/animation/AnimBlendAssociation.cpp
@@ -147,11 +147,11 @@ CAnimBlendAssociation::Start(float time)
SetCurrentTime(time);
}
-void
+bool
CAnimBlendAssociation::UpdateTime(float timeDelta, float relSpeed)
{
if(!IsRunning())
- return;
+ return true;
timeStep = (flags & ASSOC_MOVEMENT ? relSpeed*hierarchy->totalLength : speed) * timeDelta;
currentTime += timeStep;
@@ -174,6 +174,7 @@ CAnimBlendAssociation::UpdateTime(float timeDelta, float relSpeed)
}
}
}
+ return true;
}
// return whether we still exist after this function