Ensure we don't leave our sprites in walking-in-place mode due to timing issues with resolving all the art.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1001 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-08-27 00:57:34 +00:00
parent b5dd723ef1
commit db9e350404
1 changed files with 7 additions and 3 deletions
@@ -234,10 +234,14 @@ public class CharacterSprite extends Sprite
    {
        DisplayUtil.removeAllChildren(_mainSprite);
        if (_aframes != null) {
+            var curFrames :ActionFrames = _aframes;
            _aframes.getFrames(_orient, function(frames :MultiFrameBitmap) :void {
-                _framesBitmap = frames;
-                DisplayUtil.removeAllChildren(_mainSprite);
-                _mainSprite.addChild(frames);
+                // Ensure our action hasn't been swapped out on us since we started loading.
+                if (_aframes == curFrames) {
+                    _framesBitmap = frames;
+                    DisplayUtil.removeAllChildren(_mainSprite);
+                    _mainSprite.addChild(frames);
+                }
            });
        } else {
            _framesBitmap = null;