summaryrefslogtreecommitdiffstats
path: root/src/animation/AnimBlendAssociation.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-09 01:51:40 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-09 01:51:40 +0200
commitd686f587ccf69e533bf95b8fa4e18db82d710890 (patch)
tree48b4429d0e167a0ff75cce8b63f5024b396408bb /src/animation/AnimBlendAssociation.cpp
parentFix corona scaling (diff)
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
downloadre3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.gz
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.bz2
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.lz
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.xz
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.zst
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.zip
Diffstat (limited to 'src/animation/AnimBlendAssociation.cpp')
-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