summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-20 18:07:37 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-20 18:07:37 +0300
commitd7db223d0663df45756b184307a77eb11aba8cec (patch)
tree952a6c237076a76c978036607b2ea4042d8b27af
parent0d6c76d9827442d4f89482b64077cba8a7ddc47d (diff)
downloadmv-d7db223d0663df45756b184307a77eb11aba8cec.tar.gz
mv-d7db223d0663df45756b184307a77eb11aba8cec.tar.bz2
mv-d7db223d0663df45756b184307a77eb11aba8cec.tar.xz
mv-d7db223d0663df45756b184307a77eb11aba8cec.zip
Move spritedirection into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/effectmanager.h3
-rw-r--r--src/enums/resources/spritedirection.h (renamed from src/resources/spritedirection.h)0
-rw-r--r--src/resources/action.h2
-rw-r--r--src/resources/db/itemdb.cpp3
-rw-r--r--src/resources/iteminfo.cpp2
-rw-r--r--src/resources/sprite/spritedef.h2
8 files changed, 9 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 800ae25a8..571f910fd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -737,7 +737,7 @@ SET(SRCS
const/resources/spriteaction.h
resources/sprite/spritedef.h
resources/sprite/spritedef.cpp
- resources/spritedirection.h
+ enums/resources/spritedirection.h
resources/spritedisplay.h
resources/spritereference.h
resources/subimage.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 3e036fe7b..d980af308 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -386,7 +386,7 @@ SRC += events/actionevent.h \
const/resources/spriteaction.h \
resources/sprite/spritedef.cpp \
resources/sprite/spritedef.h \
- resources/spritedirection.h \
+ enums/resources/spritedirection.h \
resources/subimage.cpp \
resources/subimage.h \
resources/surfaceimagehelper.cpp \
diff --git a/src/effectmanager.h b/src/effectmanager.h
index a76899e25..d72a7cc96 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -23,10 +23,11 @@
#ifndef EFFECTMANAGER_H
#define EFFECTMANAGER_H
+#include "enums/resources/spritedirection.h"
+
#include "particle/particletimer.h"
#include "resources/effectdescription.h"
-#include "resources/spritedirection.h"
#include <vector>
#include <list>
diff --git a/src/resources/spritedirection.h b/src/enums/resources/spritedirection.h
index 92c7ac09e..92c7ac09e 100644
--- a/src/resources/spritedirection.h
+++ b/src/enums/resources/spritedirection.h
diff --git a/src/resources/action.h b/src/resources/action.h
index d9426d8c1..c73c96c93 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -23,7 +23,7 @@
#ifndef RESOURCES_ACTION_H
#define RESOURCES_ACTION_H
-#include "resources/spritedirection.h"
+#include "enums/resources/spritedirection.h"
#include <map>
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 42c2f645b..5429698f1 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -27,10 +27,11 @@
#include "configuration.h"
#include "logger.h"
+#include "enums/resources/spritedirection.h"
+
#include "resources/beingcommon.h"
#include "resources/iteminfo.h"
#include "resources/itemtypemapdata.h"
-#include "resources/spritedirection.h"
#include "resources/spritereference.h"
#include "resources/db/itemdbstat.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 03f0ad422..2d48ccd66 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -26,7 +26,7 @@
#include "const/resources/map/map.h"
-#include "resources/spritedirection.h"
+#include "enums/resources/spritedirection.h"
#include "resources/db/colordb.h"
#include "resources/db/itemdb.h"
diff --git a/src/resources/sprite/spritedef.h b/src/resources/sprite/spritedef.h
index 02ce98ff9..cab987668 100644
--- a/src/resources/sprite/spritedef.h
+++ b/src/resources/sprite/spritedef.h
@@ -25,7 +25,7 @@
#include "resources/resource.h"
-#include "resources/spritedirection.h"
+#include "enums/resources/spritedirection.h"
#include "utils/xml.h"