Move mapconsts.h into const directory.

13 files changed, 19 insertions, 16 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2638c9f08..5af3ac562 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -987,7 +987,7 @@ SET(SRCS
     resources/map/location.h
     resources/map/map.cpp
     resources/map/map.h
-    resources/map/mapconsts.h
+    const/resources/map/map.h
     resources/map/mapheights.cpp
     resources/map/mapheights.h
     resources/map/mapitem.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 930f1916c..a27ace903 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1168,7 +1168,7 @@ manaplus_SOURCES += main.cpp \
 	      resources/map/location.h \
 	      resources/map/map.cpp \
 	      resources/map/map.h \
-	      resources/map/mapconsts.h \
+	      const/resources/map/map.h \
 	      resources/map/mapheights.cpp \
 	      resources/map/mapheights.h \
 	      resources/map/mapitem.cpp \
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index 7d86742d8..0560f2d43 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -22,11 +22,11 @@
 #ifndef BEING_ACTORSPRITE_H
 #define BEING_ACTORSPRITE_H
 
-#include "resources/map/mapconsts.h"
-
 #include "being/actor.h"
 #include "being/compoundsprite.h"
 
+#include "const/resources/map/map.h"
+
 #include "enums/being/actortype.h"
 #include "enums/being/targetcursorsize.h"
 #include "enums/being/targetcursortype.h"
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 98313cc15..3d01273bd 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -32,8 +32,9 @@
 
 #include "being/compounditem.h"
 
+#include "const/resources/map/map.h"
+
 #include "resources/map/map.h"
-#include "resources/map/mapconsts.h"
 
 #include "render/surfacegraphics.h"
 
diff --git a/src/resources/map/mapconsts.h b/src/const/resources/map/map.h
index ccf54c3dc..ccf54c3dc 100644
--- a/src/resources/map/mapconsts.h
+++ b/src/const/resources/map/map.h
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index 8a8705b38..d5e419581 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -22,6 +22,10 @@
 
 #include "gui/widgets/tabs/setup_other.h"
 
+#include "configuration.h"
+
+#include "const/resources/map/map.h"
+
 #include "gui/models/namesmodel.h"
 
 #include "gui/widgets/containerplacer.h"
@@ -31,10 +35,6 @@
 
 #include "listeners/uploadlistener.h"
 
-#include "configuration.h"
-
-#include "resources/map/mapconsts.h"
-
 #include "net/net.h"
 
 #include "utils/delete2.h"
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 5cba3ba54..739bd915b 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -24,7 +24,7 @@
 
 #include "logger.h"
 
-#include "resources/map/mapconsts.h"
+#include "const/resources/map/map.h"
 
 #include "particle/animationparticle.h"
 #include "particle/rotationalparticle.h"
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 9de6b307e..42c2f645b 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/db/itemdb.h"
 
-#include "resources/map/mapconsts.h"
+#include "const/resources/map/map.h"
 
 #include "configuration.h"
 #include "logger.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index bd4a0f704..490a185bc 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -25,7 +25,7 @@
 #include "resources/spriteaction.h"
 #include "resources/spritedirection.h"
 
-#include "resources/map/mapconsts.h"
+#include "const/resources/map/map.h"
 
 #include "resources/db/colordb.h"
 #include "resources/db/itemdb.h"
diff --git a/src/resources/map/speciallayer.cpp b/src/resources/map/speciallayer.cpp
index 95ec90e35..faa2ef6f0 100644
--- a/src/resources/map/speciallayer.cpp
+++ b/src/resources/map/speciallayer.cpp
@@ -20,9 +20,10 @@
 
 #include "resources/map/speciallayer.h"
 
+#include "const/resources/map/map.h"
+
 #include "enums/resources/map/mapitemtype.h"
 
-#include "resources/map/mapconsts.h"
 #include "resources/map/mapitem.h"
 
 #include "utils/delete2.h"
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 4c5776e6d..be4b4cb67 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -28,10 +28,11 @@
 #endif
 #include "logger.h"
 
+#include "const/resources/map/map.h"
+
 #include "enums/resources/map/mapitemtype.h"
 
 #include "resources/map/map.h"
-#include "resources/map/mapconsts.h"
 #include "resources/map/mapheights.h"
 #include "resources/map/tileset.h"
 
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 8626a9e6e..53b975a9f 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -26,7 +26,7 @@
 #include "logger.h"
 #include "settings.h"
 
-#include "resources/map/mapconsts.h"
+#include "const/resources/map/map.h"
 
 #include "resources/action.h"
 #include "resources/animation.h"
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 90f39fbc9..9a82fe9fa 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -22,7 +22,7 @@
 
 #include "simpleanimation.h"
 
-#include "resources/map/mapconsts.h"
+#include "const/resources/map/map.h"
 
 #include "render/graphics.h"