stop animation when jumping

diff --git a/Weave/Scene/Marvin.cpp b/Weave/Scene/Marvin.cpp
index 43c308838484b93ead00e1bcd149f6fa0daf28ad..d0a3425144536397b74755d44d1d09e1a5e35684 100644 (file)
--- a/Weave/Scene/Marvin.cpp
+++ b/Weave/Scene/Marvin.cpp
@@ -43,6 +43,7 @@ void Marvin::update(float deltaT)
                if (Events::getJump() && abs(yFloorDist) < .5)
                {
                        ySpeed = 5.5;
+                       startanimation(0, 0);
                        //startanimation(1, 1);
                        //setAnimationLoop(false);
                }
@@ -70,7 +71,7 @@ void Marvin::update(float deltaT)
                }
 
                //MOVE Animation
-               if (abs(yFloorDist) < .5)
+               if (abs(yFloorDist) < .5 && ySpeed <= 0)
                {
                        if (move_y > 0)
                        {