summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-29 01:23:47 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-29 01:23:47 +0300
commitbf41f3154225eb49d9d6f83563f157d1f9ce3f6b (patch)
tree570eb33f7469dfe7cf3bb6912cd507b4611fa927 /src/resources
parentc1e8335738200b3c217956e897eba8f6faaf6f41 (diff)
downloadmv-bf41f3154225eb49d9d6f83563f157d1f9ce3f6b.tar.gz
mv-bf41f3154225eb49d9d6f83563f157d1f9ce3f6b.tar.bz2
mv-bf41f3154225eb49d9d6f83563f157d1f9ce3f6b.tar.xz
mv-bf41f3154225eb49d9d6f83563f157d1f9ce3f6b.zip
Move animation into animation directory.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/action.cpp2
-rw-r--r--src/resources/animation/animation.cpp (renamed from src/resources/animation.cpp)2
-rw-r--r--src/resources/animation/animation.h (renamed from src/resources/animation.h)6
-rw-r--r--src/resources/mapreader.cpp3
-rw-r--r--src/resources/sprite/animatedsprite.cpp3
-rw-r--r--src/resources/sprite/spritedef.cpp3
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"