should've been in previous commit

diff --git a/Weave/Scene/SceneObject.cpp b/Weave/Scene/SceneObject.cpp
index 25b243d931728eb3ea32888863cef479af9129ac..1405be666073fab28d0c5e0703d286b2a74f7f7a 100644 (file)
--- 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);
+                               }
                        }
                }
        }