Move animation into animation directory.

6 files changed, 11 insertions, 8 deletions

diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index 64057300b..f79611a57 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/action.h"
 
-#include "resources/animation.h"
+#include "resources/animation/animation.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/resources/animation.cpp b/src/resources/animation/animation.cpp
index a47220b2b..31e4eaf5c 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation/animation.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resources/animation.h"
+#include "resources/animation/animation.h"
 
 #include "debug.h"
 
diff --git a/src/resources/animation.h b/src/resources/animation/animation.h
index 763818e4b..cb0c3afb6 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation/animation.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_ANIMATION_H
-#define RESOURCES_ANIMATION_H
+#ifndef RESOURCES_ANIMATION_ANIMATION_H
+#define RESOURCES_ANIMATION_ANIMATION_H
 
 #include "resources/frame.h"
 
@@ -92,4 +92,4 @@ class Animation final
         int mDuration;
 };
 
-#endif  // RESOURCES_ANIMATION_H
+#endif  // RESOURCES_ANIMATION_ANIMATION_H
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index be4b4cb67..a2f493f0d 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -36,11 +36,12 @@
 #include "resources/map/mapheights.h"
 #include "resources/map/tileset.h"
 
-#include "resources/animation.h"
 #include "resources/beingcommon.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/animation/animation.h"
+
 #ifdef USE_OPENGL
 #include "resources/db/mapdb.h"
 #endif
diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp
index 32a0cf983..f06a3cc6a 100644
--- a/src/resources/sprite/animatedsprite.cpp
+++ b/src/resources/sprite/animatedsprite.cpp
@@ -29,11 +29,12 @@
 #include "render/graphics.h"
 
 #include "resources/action.h"
-#include "resources/animation.h"
 #include "resources/delayedmanager.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/animation/animation.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp
index 42c076f5a..d54516ad1 100644
--- a/src/resources/sprite/spritedef.cpp
+++ b/src/resources/sprite/spritedef.cpp
@@ -31,10 +31,11 @@
 #include "const/resources/map/map.h"
 
 #include "resources/action.h"
-#include "resources/animation.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/animation/animation.h"
+
 #include "resources/dye/dye.h"
 
 #include "resources/sprite/spritereference.h"