From: LockedLunatic <locked.lunatic@aon.at>
Date: Fri, 24 Jun 2016 00:18:59 +0000 (+0200)
Subject: should've been in previous commit
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=5b765d28cc3b906c4690551c5bb3d2695656f46b;p=cgue_weave.git

should've been in previous commit
---

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);
+				}
 			}
 		}
 	}