From 5b765d28cc3b906c4690551c5bb3d2695656f46b Mon Sep 17 00:00:00 2001 From: LockedLunatic Date: Fri, 24 Jun 2016 02:18:59 +0200 Subject: [PATCH] should've been in previous commit --- Weave/Scene/SceneObject.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Weave/Scene/SceneObject.cpp b/Weave/Scene/SceneObject.cpp index 25b243d..1405be6 100644 --- a/Weave/Scene/SceneObject.cpp +++ b/Weave/Scene/SceneObject.cpp @@ -403,7 +403,10 @@ void SceneObject::updateAnimation(float deltaT) AnimationTime = 0; animationSpeed = 0; - mainScene->addEvent(this, 1); + if (!timeresistant) + { + mainScene->addEvent(this, 1); + } } } while (AnimationTime >= model->animationduration) @@ -417,7 +420,10 @@ void SceneObject::updateAnimation(float deltaT) AnimationTime = model->animationduration - 0.01f; animationSpeed = 0; - mainScene->addEvent(this, 0); + if (!timeresistant) + { + mainScene->addEvent(this, 0); + } } } } -- 2.47.3