Merging Source v1.7.2: sprite changes

2014-10-20 20:12:43 -04:00
parent 33db534e25
commit 9f49d115d2
8 changed files with 96 additions and 11 deletions
@@ -59,10 +59,14 @@ public class TenguSprite extends MobSprite {
 		
 		play( run );
 		turnTo( from , to );
-		
-		if (Level.water[to]) {
+
+        isMoving = true;
+
+        if (Level.water[to]) {
 			GameScene.ripple( to );
 		}
+
+        ch.onMotionComplete();
 	}
 	
 	@Override
@@ -90,8 +94,8 @@ public class TenguSprite extends MobSprite {
 	@Override
 	public void onComplete( Animation anim ) {
 		if (anim == run) {
-			idle();
-			ch.onMotionComplete();
+            isMoving = false;
+            idle();
 		} else {
 			super.onComplete( anim );
 		}