summaryrefslogtreecommitdiff
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
parentc1e8335738200b3c217956e897eba8f6faaf6f41 (diff)
downloadmv-bf41f3154225eb49d9d6f83563f157d1f9ce3f6b.tar.gz
mv-bf41f3154225eb49d9d6f83563f157d1f9ce3f6b.tar.bz2
mv-bf41f3154225eb49d9d6f83563f157d1f9ce3f6b.tar.xz
mv-bf41f3154225eb49d9d6f83563f157d1f9ce3f6b.zip
Move animation into animation directory.
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/widgets/progressindicator.cpp3
-rw-r--r--src/particle/particleemitter.h2
-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
-rw-r--r--src/simpleanimation.cpp3
11 files changed, 22 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 33a7e139b..7e94161b9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -591,8 +591,8 @@ SET(SRCS
resources/action.h
resources/ambientlayer.cpp
resources/ambientlayer.h
- resources/animation.cpp
- resources/animation.h
+ resources/animation/animation.cpp
+ resources/animation/animation.h
resources/atlas/atlasitem.h
resources/atlas/atlasmanager.cpp
resources/atlas/atlasmanager.h
@@ -1330,8 +1330,8 @@ SET(DYE_CMD_SRCS
render/mgltypes.h
resources/action.cpp
resources/action.h
- resources/animation.cpp
- resources/animation.h
+ resources/animation/animation.cpp
+ resources/animation/animation.h
resources/db/palettedb.cpp
resources/db/palettedb.h
resources/delayedmanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 72579252d..1b365ed6f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -640,8 +640,8 @@ SRC += events/actionevent.h \
render/shaders/shaderprogram.h \
render/shaders/shadersmanager.cpp \
render/shaders/shadersmanager.h \
- resources/animation.cpp \
- resources/animation.h \
+ resources/animation/animation.cpp \
+ resources/animation/animation.h \
simpleanimation.cpp \
simpleanimation.h \
resources/sprite/sprite.h \
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index cdbbc7335..efe65507f 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -25,9 +25,10 @@
#include "gui/gui.h"
-#include "resources/animation.h"
#include "resources/imageset.h"
+#include "resources/animation/animation.h"
+
#include "utils/delete2.h"
#include "debug.h"
diff --git a/src/particle/particleemitter.h b/src/particle/particleemitter.h
index 41381b6e1..00fd34db6 100644
--- a/src/particle/particleemitter.h
+++ b/src/particle/particleemitter.h
@@ -25,7 +25,7 @@
#include "particle/particleemitterprop.h"
-#include "resources/animation.h"
+#include "resources/animation/animation.h"
#include "utils/xml.h"
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"
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 877b51e7c..e6c98dddd 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -26,10 +26,11 @@
#include "render/graphics.h"
-#include "resources/animation.h"
#include "resources/imageset.h"
#include "resources/resourcemanager.h"
+#include "resources/animation/animation.h"
+
#include "resources/dye/dye.h"
#include "utils/delete2.h"