diff options
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/animation.cpp | 4 | ||||
-rw-r--r-- | src/resources/animation.h | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index fe5822f7b..98ea19f2a 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -31,7 +31,7 @@ Animation::Animation(): void Animation::addFrame(Image *image, int delay, int offsetX, int offsetY) { - Frame frame = { image, delay, offsetX, offsetY, "" }; + Frame frame = { image, delay, offsetX, offsetY, Frame::ANIMATION, "" }; mFrames.push_back(frame); mDuration += delay; } @@ -48,6 +48,6 @@ bool Animation::isTerminator(const Frame &candidate) void Animation::addJump(std::string name) { - Frame frame = { 0, 0, 0, 0, name }; + Frame frame = { 0, 0, 0, 0, Frame::JUMP, name }; mFrames.push_back(frame); } diff --git a/src/resources/animation.h b/src/resources/animation.h index 9ec8396af..5130bc8dd 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -35,10 +35,17 @@ class Image; */ struct Frame { + enum FrameType + { + ANIMATION = 0, + JUMP, + LABEL + }; Image *image; int delay; int offsetX; int offsetY; + FrameType type; std::string nextAction; }; |