summaryrefslogtreecommitdiff
path: root/src/resources/animation/animation.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-10-04 03:33:13 +0300
committerAndrei Karas <akaras@inbox.ru>2016-10-04 03:33:13 +0300
commit29549cf31a03e2ac7290afaa7442b3b9519d4e7c (patch)
treecb01d06c5d2349ca5c6e843f07e251f3a85ae50b /src/resources/animation/animation.cpp
parent2ec30fd9bac60bb7e4752e3bba0036c078019d0a (diff)
downloadmv-29549cf31a03e2ac7290afaa7442b3b9519d4e7c.tar.gz
mv-29549cf31a03e2ac7290afaa7442b3b9519d4e7c.tar.bz2
mv-29549cf31a03e2ac7290afaa7442b3b9519d4e7c.tar.xz
mv-29549cf31a03e2ac7290afaa7442b3b9519d4e7c.zip
Move FrameType enum into enums directory.
Diffstat (limited to 'src/resources/animation/animation.cpp')
-rw-r--r--src/resources/animation/animation.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/resources/animation/animation.cpp b/src/resources/animation/animation.cpp
index 22ca96fd7..1a10f5224 100644
--- a/src/resources/animation/animation.cpp
+++ b/src/resources/animation/animation.cpp
@@ -45,7 +45,7 @@ void Animation::addFrame(Image *const image, const int delay,
const int rand) noexcept2
{
Frame frame
- = { image, delay, offsetX, offsetY, rand, Frame::ANIMATION, "" };
+ = { image, delay, offsetX, offsetY, rand, FrameType::ANIMATION, "" };
mFrames.push_back(frame);
mDuration += delay;
}
@@ -57,30 +57,30 @@ void Animation::addTerminator(const int rand) noexcept2
bool Animation::isTerminator(const Frame &candidate) noexcept2
{
- return (!candidate.image && candidate.type == Frame::ANIMATION);
+ return (!candidate.image && candidate.type == FrameType::ANIMATION);
}
void Animation::addJump(const std::string &name, const int rand) noexcept2
{
- Frame frame = { nullptr, 0, 0, 0, rand, Frame::JUMP, name };
+ Frame frame = { nullptr, 0, 0, 0, rand, FrameType::JUMP, name };
mFrames.push_back(frame);
}
void Animation::addLabel(const std::string &name) noexcept2
{
- Frame frame = { nullptr, 0, 0, 0, 100, Frame::LABEL, name };
+ Frame frame = { nullptr, 0, 0, 0, 100, FrameType::LABEL, name };
mFrames.push_back(frame);
}
void Animation::addGoto(const std::string &name, const int rand) noexcept2
{
- Frame frame = { nullptr, 0, 0, 0, rand, Frame::GOTO, name };
+ Frame frame = { nullptr, 0, 0, 0, rand, FrameType::GOTO, name };
mFrames.push_back(frame);
}
void Animation::addPause(const int delay, const int rand) noexcept2
{
- Frame frame = { nullptr, delay, 0, 0, rand, Frame::PAUSE, "" };
+ Frame frame = { nullptr, delay, 0, 0, rand, FrameType::PAUSE, "" };
mFrames.push_back(frame);
}
@@ -89,7 +89,7 @@ void Animation::setLastFrameDelay(const int delay) noexcept2
for (FramesRevIter it = mFrames.rbegin(), it_end = mFrames.rend();
it != it_end; ++ it)
{
- if ((*it).type == Frame::ANIMATION && (*it).image)
+ if ((*it).type == FrameType::ANIMATION && (*it).image)
{
(*it).delay = delay;
break;