diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
| commit | b30a5d2289a0b68410dee5343e148aba88ea4839 (patch) | |
| tree | 9d756785b9166ced76675ad3ebe398c09b494a3c /src/animatedsprite.cpp | |
| parent | 9a3a196dbf633a699c26d0227802a42f025c8bfd (diff) | |
| parent | 164e4ed5a153ce06badb52f3a5a4dff16c58d7e6 (diff) | |
| download | mv-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.gz mv-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.bz2 mv-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.xz mv-b30a5d2289a0b68410dee5343e148aba88ea4839.zip | |
Merge branch 'master' into stripped
Diffstat (limited to 'src/animatedsprite.cpp')
| -rw-r--r-- | src/animatedsprite.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 11329b321..6b791fdd4 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -214,7 +214,12 @@ bool AnimatedSprite::updateCurrentAnimation(unsigned int time) } } if (fail) - mFrameTime = mFrame->delay + 1; + { + if (mFrame) + mFrameTime = mFrame->delay + 1; + else + mFrameTime ++; + } } return true; } |