4 files changed, 123 insertions, 3 deletions
diff --git a/src/resources/delayedmanager.cpp b/src/resources/delayedmanager.cpp
index b001db124..cc27dc0d2 100644
--- a/src/resources/delayedmanager.cpp
+++ b/src/resources/delayedmanager.cpp
@@ -20,7 +20,7 @@
 
 #include "resources/delayedmanager.h"
 
-#include "animationdelayload.h"
+#include "resources/sprite/animationdelayload.h"
 
 #include "utils/timer.h"
 
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