summaryrefslogtreecommitdiff
path: root/src/resources/sprite
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-29 01:34:51 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-29 01:34:51 +0300
commitfe70d4929e6ca0e46e6210d8795056c6e8a4b93d (patch)
tree5a17df5190995e585a2adb183d4ecc44fdef36d9 /src/resources/sprite
parent3c5c3770c2769caa3b33ff7e683d02291ac56bfb (diff)
downloadmv-fe70d4929e6ca0e46e6210d8795056c6e8a4b93d.tar.gz
mv-fe70d4929e6ca0e46e6210d8795056c6e8a4b93d.tar.bz2
mv-fe70d4929e6ca0e46e6210d8795056c6e8a4b93d.tar.xz
mv-fe70d4929e6ca0e46e6210d8795056c6e8a4b93d.zip
Move animationdelayload into sprite directory.
Diffstat (limited to 'src/resources/sprite')
-rw-r--r--src/resources/sprite/animatedsprite.cpp4
-rw-r--r--src/resources/sprite/animationdelayload.cpp65
-rw-r--r--src/resources/sprite/animationdelayload.h55
3 files changed, 122 insertions, 2 deletions
diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp
index f06a3cc6a..98d4b418d 100644
--- a/src/resources/sprite/animatedsprite.cpp
+++ b/src/resources/sprite/animatedsprite.cpp
@@ -22,8 +22,6 @@
#include "resources/sprite/animatedsprite.h"
-#include "animationdelayload.h"
-
#include "const/resources/spriteaction.h"
#include "render/graphics.h"
@@ -35,6 +33,8 @@
#include "resources/animation/animation.h"
+#include "resources/sprite/animationdelayload.h"
+
#include "utils/delete2.h"
#include "debug.h"
diff --git a/src/resources/sprite/animationdelayload.cpp b/src/resources/sprite/animationdelayload.cpp
new file mode 100644
index 000000000..8800cb754
--- /dev/null
+++ b/src/resources/sprite/animationdelayload.cpp
@@ -0,0 +1,65 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/sprite/animationdelayload.h"
+
+#include "const/resources/spriteaction.h"
+
+#include "resources/resourcemanager.h"
+
+#include "resources/sprite/animatedsprite.h"
+
+#include "debug.h"
+
+AnimationDelayLoad::AnimationDelayLoad(const std::string &fileName,
+ const int variant,
+ AnimatedSprite *const sprite) :
+ mFileName(fileName),
+ mVariant(variant),
+ mSprite(sprite),
+ mAction(SpriteAction::STAND)
+{
+}
+
+AnimationDelayLoad::~AnimationDelayLoad()
+{
+ if (mSprite)
+ {
+ mSprite->clearDelayLoad();
+ mSprite = nullptr;
+ }
+}
+
+void AnimationDelayLoad::clearSprite()
+{
+ mSprite = nullptr;
+}
+
+void AnimationDelayLoad::load()
+{
+ if (mSprite)
+ {
+ SpriteDef *const s = resourceManager->getSprite(mFileName, mVariant);
+ if (!s)
+ return;
+ mSprite->setSprite(s);
+ mSprite->play(mAction);
+ }
+}
diff --git a/src/resources/sprite/animationdelayload.h b/src/resources/sprite/animationdelayload.h
new file mode 100644
index 000000000..9e91a1949
--- /dev/null
+++ b/src/resources/sprite/animationdelayload.h
@@ -0,0 +1,55 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_SPRITE_ANIMATIONDELAYLOAD_H
+#define RESOURCES_SPRITE_ANIMATIONDELAYLOAD_H
+
+#include <string>
+
+#include "localconsts.h"
+
+class AnimatedSprite;
+
+class AnimationDelayLoad final
+{
+ public:
+ AnimationDelayLoad(const std::string &fileName,
+ const int variant,
+ AnimatedSprite *const sprite);
+
+ A_DELETE_COPY(AnimationDelayLoad)
+
+ ~AnimationDelayLoad();
+
+ void clearSprite();
+
+ void load();
+
+ void setAction(const std::string &action)
+ { mAction = action; }
+
+ private:
+ std::string mFileName;
+ int mVariant;
+ AnimatedSprite *mSprite;
+ std::string mAction;
+};
+
+#endif // RESOURCES_SPRITE_ANIMATIONDELAYLOAD_H