diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-06-22 18:18:39 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-06-23 04:17:28 +0200 |
| commit | a3e5eadaa503e16a4e02af40f1d36a2bb0b5c243 (patch) | |
| tree | 49d94fee1286d5c8c5dc01fdf22e7b3dda4338a9 /src/compoundsprite.cpp | |
| parent | ba5b70974c5dfa0be3105e72a0a012455b28e7a9 (diff) | |
| download | mana-a3e5eadaa503e16a4e02af40f1d36a2bb0b5c243.tar.gz mana-a3e5eadaa503e16a4e02af40f1d36a2bb0b5c243.tar.bz2 mana-a3e5eadaa503e16a4e02af40f1d36a2bb0b5c243.tar.xz mana-a3e5eadaa503e16a4e02af40f1d36a2bb0b5c243.zip | |
Made the being death sequence better handled.
Now the death animation is set to the minimum of 1.5 seconds
just as in the older versions, but permit longer sequences
as well.
I didn't put a maximum hard cap on it as it may be a burden
for the maintainers whatever the hard cap would be,
and as it isn't vital to set one anyway.
Resolves: Mana-Mantis #364.
Reviewed-by: bjorn, Jaxad0127.
Diffstat (limited to 'src/compoundsprite.cpp')
| -rw-r--r-- | src/compoundsprite.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index d77005c7..5214890c 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -255,6 +255,17 @@ size_t CompoundSprite::getFrameCount(size_t layer) return 0; } +int CompoundSprite::getDuration() const +{ + int duration = 0; + SpriteConstIterator it, it_end; + for (it = begin(), it_end = end(); it != it_end; it++) + if ((*it) && (*it)->getDuration() > duration) + duration = (*it)->getDuration(); + + return duration; +} + static void updateValues(int &dimension, int &pos, int imgDimUL, int imgDimRD, int imgOffset) { // Handle going beyond the left/up |