summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-29 14:12:56 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-29 14:14:16 +0300
commit79ce2bbf16855460051a183c4740e94706b7a07b (patch)
tree98d4ce482160d17d5529f392ae8d3eb9f8cb1eb2 /src
parent436088e97ae3ee8bcfd0530139579fc62271bbc5 (diff)
downloadmv-79ce2bbf16855460051a183c4740e94706b7a07b.tar.gz
mv-79ce2bbf16855460051a183c4740e94706b7a07b.tar.bz2
mv-79ce2bbf16855460051a183c4740e94706b7a07b.tar.xz
mv-79ce2bbf16855460051a183c4740e94706b7a07b.zip
Move blockmask.h into enums directory.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/resources/map/blockmask.h (renamed from src/resources/map/blockmask.h)6
-rw-r--r--src/resources/beinginfo.cpp4
-rw-r--r--src/resources/db/homunculusdb.cpp4
-rw-r--r--src/resources/db/mercenarydb.cpp4
-rw-r--r--src/resources/db/monsterdb.cpp4
-rw-r--r--src/resources/map/map.h2
8 files changed, 14 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4535fa97a..ca774fd11 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -940,7 +940,7 @@ SET(SRCS
logger.h
main.cpp
main.h
- resources/map/blockmask.h
+ enums/resources/map/blockmask.h
resources/map/blocktype.h
resources/map/location.h
resources/map/map.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 094d25a33..3d7835bd0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1079,7 +1079,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
logger.h \
main.cpp \
main.h \
- resources/map/blockmask.h \
+ enums/resources/map/blockmask.h \
resources/map/blocktype.h \
resources/map/location.h \
resources/map/map.cpp \
diff --git a/src/resources/map/blockmask.h b/src/enums/resources/map/blockmask.h
index cec060255..83a6ffedb 100644
--- a/src/resources/map/blockmask.h
+++ b/src/enums/resources/map/blockmask.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RESOURCES_MAP_BLOCKMASK_H
-#define RESOURCES_MAP_BLOCKMASK_H
+#ifndef ENUMS_RESOURCES_MAP_BLOCKMASK_H
+#define ENUMS_RESOURCES_MAP_BLOCKMASK_H
namespace BlockMask
{
@@ -37,4 +37,4 @@ namespace BlockMask
};
}
-#endif // RESOURCES_MAP_BLOCKMASK_H
+#endif // ENUMS_RESOURCES_MAP_BLOCKMASK_H
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 28f421a2e..f63e65134 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -25,14 +25,14 @@
#include "configuration.h"
#include "logger.h"
+#include "enums/resources/map/blockmask.h"
+
#include "resources/attack.h"
#include "resources/spriteaction.h"
#include "resources/spritereference.h"
#include "resources/db/colordb.h"
-#include "resources/map/blockmask.h"
-
#include "utils/delete2.h"
#include "utils/dtor.h"
#include "utils/gettext.h"
diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 697b74431..4526228e4 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -24,11 +24,11 @@
#include "logger.h"
+#include "enums/resources/map/blockmask.h"
+
#include "resources/beingcommon.h"
#include "resources/beinginfo.h"
-#include "resources/map/blockmask.h"
-
#include "utils/dtor.h"
#include "configuration.h"
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index a6950e9fb..cdd4c71e1 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -24,11 +24,11 @@
#include "logger.h"
+#include "enums/resources/map/blockmask.h"
+
#include "resources/beingcommon.h"
#include "resources/beinginfo.h"
-#include "resources/map/blockmask.h"
-
#include "utils/dtor.h"
#include "configuration.h"
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 2e2256b58..a7eda3681 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -24,11 +24,11 @@
#include "logger.h"
+#include "enums/resources/map/blockmask.h"
+
#include "resources/beingcommon.h"
#include "resources/beinginfo.h"
-#include "resources/map/blockmask.h"
-
#include "utils/dtor.h"
#include "utils/gettext.h"
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 4553f5aa8..86dc78e2d 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -29,9 +29,9 @@
#include "enums/render/rendertype.h"
+#include "enums/resources/map/blockmask.h"
#include "enums/resources/map/maptype.h"
-#include "resources/map/blockmask.h"
#include "resources/map/blocktype.h"
#include "resources/map/properties.h"