diff options
| author | David Athay <ko2fan@gmail.com> | 2009-02-11 09:30:26 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-02-11 09:30:26 +0000 |
| commit | 91111ca5d13072ea3b834e23835df9c077329e39 (patch) | |
| tree | f0af8dd08b766164835cf9b5412a9aa3267dbad7 /src/resources/animation.cpp | |
| parent | 8046bb2626b30fecdcea54eb0aa3349cdb7d277b (diff) | |
| parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
| download | mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.gz mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.bz2 mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.xz mana-client-91111ca5d13072ea3b834e23835df9c077329e39.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/resources/animation.cpp')
| -rw-r--r-- | src/resources/animation.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index 62e5ac16..54c319de 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -21,8 +21,6 @@ #include "animation.h" -#include <algorithm> - #include "../utils/dtor.h" Animation::Animation(): @@ -30,22 +28,19 @@ Animation::Animation(): { } -void -Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY) +void Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY) { Frame frame = { image, delay, offsetX, offsetY }; mFrames.push_back(frame); mDuration += delay; } -void -Animation::addTerminator() +void Animation::addTerminator() { addFrame(NULL, 0, 0, 0); } -bool -Animation::isTerminator(const Frame &candidate) +bool Animation::isTerminator(const Frame &candidate) { return (candidate.image == NULL); } |