Move map consts into separate file.

14 files changed, 40 insertions, 8 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 46b0e2e90..806c2173f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -707,6 +707,7 @@ SET(SRCS
     resources/map/location.h
     resources/map/map.cpp
     resources/map/map.h
+    resources/map/mapconsts.h
     resources/map/mapheights.cpp
     resources/map/mapheights.h
     resources/map/mapitem.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 89870470f..605931a0c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -796,6 +796,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      resources/map/location.h \
 	      resources/map/map.cpp \
 	      resources/map/map.h \
+	      resources/map/mapconsts.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 ed0d328de..bda1ea611 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -25,6 +25,7 @@
 #include "localconsts.h"
 
 #include "resources/map/map.h"
+#include "resources/map/mapconsts.h"
 
 #include "being/actor.h"
 #include "being/compoundsprite.h"
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 46baaf2c9..4e496730d 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -31,6 +31,7 @@
 #include "sdlshared.h"
 
 #include "resources/map/map.h"
+#include "resources/map/mapconsts.h"
 
 #include "render/surfacegraphics.h"
 
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index 4d648bba1..c00f68eef 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -30,7 +30,7 @@
 
 #include "configuration.h"
 
-#include "resources/map/map.h"
+#include "resources/map/mapconsts.h"
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index d9e0a579a..c4b7a1266 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -25,6 +25,7 @@
 #include "logger.h"
 
 #include "resources/map/map.h"
+#include "resources/map/mapconsts.h"
 
 #include "particle/animationparticle.h"
 #include "particle/rotationalparticle.h"
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 9c8c49fc5..c2d58fccc 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/map.h"
+#include "resources/map/mapconsts.h"
 
 #include "configuration.h"
 #include "logger.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 911cacef6..d405e6909 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/iteminfo.h"
 
-#include "resources/map/map.h"
+#include "resources/map/mapconsts.h"
 
 #include "resources/db/colordb.h"
 #include "resources/db/itemdb.h"
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 8c7939149..dac1778c3 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -60,8 +60,6 @@ typedef std::vector<AmbientLayer*> AmbientLayerVector;
 typedef AmbientLayerVector::const_iterator AmbientLayerVectorCIter;
 typedef AmbientLayerVector::iterator AmbientLayerVectorIter;
 
-static const int mapTileSize = 32;
-
 /**
  * A tile map.
  */
diff --git a/src/resources/map/mapconsts.h b/src/resources/map/mapconsts.h
new file mode 100644
index 000000000..25bc9c4a9
--- /dev/null
+++ b/src/resources/map/mapconsts.h
@@ -0,0 +1,28 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_MAP_MAPCONSTS_H
+#define RESOURCES_MAP_MAPCONSTS_H
+
+static const int mapTileSize = 32;
+
+#endif  // RESOURCES_MAP_MAPCONSTS_H
diff --git a/src/resources/map/speciallayer.cpp b/src/resources/map/speciallayer.cpp
index 2ebb6ef51..284069589 100644
--- a/src/resources/map/speciallayer.cpp
+++ b/src/resources/map/speciallayer.cpp
@@ -20,7 +20,7 @@
 
 #include "resources/map/speciallayer.h"
 
-#include "resources/map/map.h"
+#include "resources/map/mapconsts.h"
 #include "resources/map/mapitem.h"
 #include "resources/map/maplayer.h"
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 3f0cb7343..ebdca49ac 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -28,6 +28,7 @@
 #include "main.h"
 
 #include "resources/map/map.h"
+#include "resources/map/mapconsts.h"
 #include "resources/map/tileset.h"
 
 #include "resources/animation.h"
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 77561d11c..c41d95aa5 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -24,7 +24,7 @@
 
 #include "logger.h"
 
-#include "resources/map/map.h"
+#include "resources/map/mapconsts.h"
 
 #include "resources/action.h"
 #include "resources/animation.h"
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 71832f559..46101ae52 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -24,7 +24,7 @@
 
 #include "logger.h"
 
-#include "resources/map/map.h"
+#include "resources/map/mapconsts.h"
 
 #include "render/graphics.h"