summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-31 01:39:11 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-31 01:39:11 +0300
commit88ed8b935542a1e2590bdd79403ff4ee5c7f2a79 (patch)
treed6e5a95683d774fe564abed4990528a2de3568be
parenta5766506d6e75ab1d2a4f06b77fddf6fdd65c64e (diff)
downloadmv-88ed8b935542a1e2590bdd79403ff4ee5c7f2a79.tar.gz
mv-88ed8b935542a1e2590bdd79403ff4ee5c7f2a79.tar.bz2
mv-88ed8b935542a1e2590bdd79403ff4ee5c7f2a79.tar.xz
mv-88ed8b935542a1e2590bdd79403ff4ee5c7f2a79.zip
Move maptype enum into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/resources/map/maptype.h (renamed from src/resources/map/maptype.h)0
-rw-r--r--src/resources/map/map.h3
-rw-r--r--src/resources/map/maplayer.h2
-rw-r--r--src/settings.h2
6 files changed, 6 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af5eb8b2b..8723cd3c4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -947,7 +947,7 @@ SET(SRCS
resources/map/mapobject.h
resources/map/mapobjectlist.h
resources/map/maprowvertexes.h
- resources/map/maptype.h
+ enums/resources/map/maptype.h
resources/map/metatile.h
resources/map/objectslayer.cpp
resources/map/objectslayer.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a3cfe0558..3786cdc52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1082,7 +1082,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
resources/map/mapobject.h \
resources/map/mapobjectlist.h \
resources/map/maprowvertexes.h \
- resources/map/maptype.h \
+ enums/resources/map/maptype.h \
resources/map/metatile.h \
resources/map/objectslayer.cpp \
resources/map/objectslayer.h \
diff --git a/src/resources/map/maptype.h b/src/enums/resources/map/maptype.h
index 27a58bccf..27a58bccf 100644
--- a/src/resources/map/maptype.h
+++ b/src/enums/resources/map/maptype.h
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index a051961a3..2cba3de6f 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -29,9 +29,10 @@
#include "enums/render/rendertype.h"
+#include "enums/resources/map/maptype.h"
+
#include "resources/map/blockmask.h"
#include "resources/map/blocktype.h"
-#include "resources/map/maptype.h"
#include "resources/map/properties.h"
#include "listeners/configlistener.h"
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index 25773ebb2..9b2617d32 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -27,7 +27,7 @@
#include "being/actor.h"
-#include "resources/map/maptype.h"
+#include "enums/resources/map/maptype.h"
#include <vector>
diff --git a/src/settings.h b/src/settings.h
index f1c087038..068bfc573 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -23,7 +23,7 @@
#include "options.h"
-#include "resources/map/maptype.h"
+#include "enums/resources/map/maptype.h"
#include <vector>