Move map related files into resources/map.

32 files changed, 85 insertions, 69 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cffef1f1..da54502f3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -704,12 +704,12 @@ SET(SRCS
     logger.h
     main.cpp
     main.h
-    map.cpp
-    map.h
-    mapheights.cpp
-    mapheights.h
-    maplayer.cpp
-    maplayer.h
+    resources/map/map.cpp
+    resources/map/map.h
+    resources/map/mapheights.cpp
+    resources/map/mapheights.h
+    resources/map/maplayer.cpp
+    resources/map/maplayer.h
     render/mgl.cpp
     render/mgl.h
     render/mobileopenglgraphics.cpp
@@ -795,8 +795,8 @@ SET(SRCS
     variabledata.h
     vector.cpp
     vector.h
-    walklayer.cpp
-    walklayer.h
+    resources/map/walklayer.cpp
+    resources/map/walklayer.h
     events/actionevent.h
     listeners/actionlistener.h
     gui/widgets/basiccontainer.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0a77df64a..de93fd832 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,8 +50,8 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
 	      logger.h \
 	      navigationmanager.cpp \
 	      navigationmanager.h \
-	      walklayer.cpp \
-	      walklayer.h \
+	      resources/map/walklayer.cpp \
+	      resources/map/walklayer.h \
 	      render/graphics.cpp \
 	      render/graphics.h \
 	      render/renderers.cpp \
@@ -793,12 +793,12 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      logger.h \
 	      main.cpp \
 	      main.h \
-	      map.cpp \
-	      map.h \
-	      mapheights.cpp \
-	      mapheights.h \
-	      maplayer.cpp \
-	      maplayer.h \
+	      resources/map/map.cpp \
+	      resources/map/map.h \
+	      resources/map/mapheights.cpp \
+	      resources/map/mapheights.h \
+	      resources/map/maplayer.cpp \
+	      resources/map/maplayer.h \
 	      render/mgl.cpp \
 	      render/mgl.h \
 	      render/mobileopenglgraphics.cpp \
@@ -882,8 +882,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      variabledata.h \
 	      vector.cpp \
 	      vector.h \
-	      walklayer.cpp \
-	      walklayer.h \
+	      resources/map/walklayer.cpp \
+	      resources/map/walklayer.h \
 	      winver.h
 
 manaplus_SOURCES += \
diff --git a/src/being/actor.cpp b/src/being/actor.cpp
index 1416b5481..7ced058d8 100644
--- a/src/being/actor.cpp
+++ b/src/being/actor.cpp
@@ -21,7 +21,7 @@
 
 #include "being/actor.h"
 
-#include "map.h"
+#include "resources/map/map.h"
 
 #include "debug.h"
 
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index fd90aba09..ed0d328de 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -23,7 +23,8 @@
 #define BEING_ACTORSPRITE_H
 
 #include "localconsts.h"
-#include "map.h"
+
+#include "resources/map/map.h"
 
 #include "being/actor.h"
 #include "being/compoundsprite.h"
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 91da283a4..46baaf2c9 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -28,9 +28,10 @@
 #include "main.h"
 #endif
 
-#include "map.h"
 #include "sdlshared.h"
 
+#include "resources/map/map.h"
+
 #include "render/surfacegraphics.h"
 
 #include "resources/image.h"
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 7a364072c..697a31069 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -29,12 +29,11 @@
 #include "dropshortcut.h"
 #include "guild.h"
 #include "item.h"
-#include "maplayer.h"
 #include "party.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 #include "statuseffect.h"
-#include "walklayer.h"
+#include "resources/map/walklayer.h"
 
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
@@ -69,6 +68,8 @@
 #include "resources/db/emotedb.h"
 #include "resources/db/weaponsdb.h"
 
+#include "resources/map/maplayer.h"
+
 #include "listeners/updatestatuslistener.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 9e6968464..4b84c47b3 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -31,7 +31,6 @@
 #include "guild.h"
 #include "guildmanager.h"
 #include "item.h"
-#include "maplayer.h"
 #include "party.h"
 #include "spellmanager.h"
 
@@ -77,6 +76,8 @@
 
 #include "resources/iteminfo.h"
 
+#include "resources/map/maplayer.h"
+
 #include "utils/copynpaste.h"
 #include "utils/gettext.h"
 #include "utils/process.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 33690ba39..e2b039fe1 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -25,10 +25,11 @@
 #include "actormanager.h"
 #include "configuration.h"
 #include "game.h"
-#include "maplayer.h"
 #include "sdlshared.h"
 #include "textmanager.h"
 
+#include "resources/map/maplayer.h"
+
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index a84ac7c6d..1ff611cab 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -24,7 +24,6 @@
 #include "actormanager.h"
 #include "configuration.h"
 #include "graphicsvertexes.h"
-#include "maplayer.h"
 
 #include "being/localplayer.h"
 
@@ -38,6 +37,8 @@
 
 #include "resources/image.h"
 
+#include "resources/map/maplayer.h"
+
 #include "debug.h"
 
 int AvatarListBox::instances = 0;
diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp
index 707a4f2b9..daf8ed8d2 100644
--- a/src/gui/widgets/tabs/setup_audio.cpp
+++ b/src/gui/widgets/tabs/setup_audio.cpp
@@ -23,7 +23,8 @@
 #include "gui/widgets/tabs/setup_audio.h"
 
 #include "main.h"
-#include "map.h"
+
+#include "resources/map/map.h"
 
 #include "configuration.h"
 #include "soundmanager.h"
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index ed8ba11ad..4d648bba1 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -29,7 +29,8 @@
 #include "gui/widgets/scrollarea.h"
 
 #include "configuration.h"
-#include "map.h"
+
+#include "resources/map/map.h"
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 34a8bcf12..dbbb9c75d 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -25,9 +25,10 @@
 #include "configuration.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "maplayer.h"
 #include "party.h"
 
+#include "resources/map/maplayer.h"
+
 #include "being/localplayer.h"
 #include "being/playerrelations.h"
 
diff --git a/src/navigationmanager.cpp b/src/navigationmanager.cpp
index b999fe769..8cbb85667 100644
--- a/src/navigationmanager.cpp
+++ b/src/navigationmanager.cpp
@@ -20,8 +20,8 @@
 
 #include "navigationmanager.h"
 
-#include "map.h"
-#include "walklayer.h"
+#include "resources/map/map.h"
+#include "resources/map/walklayer.h"
 
 static const int walkMask = (Map::BLOCKMASK_WALL | Map::BLOCKMASK_AIR
     | Map::BLOCKMASK_WATER);
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 39550f03d..d9e0a579a 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -23,7 +23,8 @@
 #include "particle/particleemitter.h"
 
 #include "logger.h"
-#include "map.h"
+
+#include "resources/map/map.h"
 
 #include "particle/animationparticle.h"
 #include "particle/rotationalparticle.h"
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index 6f760fe9d..9e0fa24b9 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -21,7 +21,7 @@
 
 #include "resources/ambientlayer.h"
 
-#include "map.h"
+#include "resources/map/map.h"
 
 #include "render/graphics.h"
 
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 81a153e04..9c8c49fc5 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/db/itemdb.h"
 
-#include "map.h"
+#include "resources/map/map.h"
 
 #include "configuration.h"
 #include "logger.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 391e546da..911cacef6 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/iteminfo.h"
 
-#include "map.h"
+#include "resources/map/map.h"
 
 #include "resources/db/colordb.h"
 #include "resources/db/itemdb.h"
diff --git a/src/map.cpp b/src/resources/map/map.cpp
index 1acfdf711..c753b0202 100644
--- a/src/map.cpp
+++ b/src/resources/map/map.cpp
@@ -20,18 +20,19 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "map.h"
+#include "resources/map/map.h"
 
 #include "client.h"
 #include "configuration.h"
 #include "render/graphics.h"
-#include "mapheights.h"
-#include "maplayer.h"
 #include "notifications.h"
 #include "notifymanager.h"
 #include "simpleanimation.h"
-#include "tileset.h"
-#include "walklayer.h"
+
+#include "resources/map/mapheights.h"
+#include "resources/map/maplayer.h"
+#include "resources/map/tileset.h"
+#include "resources/map/walklayer.h"
 
 #include "being/localplayer.h"
 
diff --git a/src/map.h b/src/resources/map/map.h
index 0ad048e7e..f0712be76 100644
--- a/src/map.h
+++ b/src/resources/map/map.h
@@ -20,14 +20,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAP_H
-#define MAP_H
+#ifndef RESOURCES_MAP_MAP_H
+#define RESOURCES_MAP_MAP_H
 
 #include "position.h"
-#include "properties.h"
 
 #include "being/actor.h"
 
+#include "resources/map/properties.h"
+
 #include "listeners/configlistener.h"
 
 #include "render/renderers.h"
@@ -536,4 +537,4 @@ class Map final : public Properties, public ConfigListener
         bool mCustom;
 };
 
-#endif  // MAP_H
+#endif  // RESOURCES_MAP_MAP_H
diff --git a/src/mapheights.cpp b/src/resources/map/mapheights.cpp
index 06d71a38a..1f93a0a84 100644
--- a/src/mapheights.cpp
+++ b/src/resources/map/mapheights.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mapheights.h"
+#include "resources/map/mapheights.h"
 
 #include "debug.h"
 
diff --git a/src/mapheights.h b/src/resources/map/mapheights.h
index a674d2334..89fc6a5c2 100644
--- a/src/mapheights.h
+++ b/src/resources/map/mapheights.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAPHEIGHTS_H
-#define MAPHEIGHTS_H
+#ifndef RESOURCES_MAP_MAPHEIGHTS_H
+#define RESOURCES_MAP_MAPHEIGHTS_H
 
 #include "localconsts.h"
 
@@ -45,4 +45,4 @@ class MapHeights final
         uint8_t *mTiles;
 };
 
-#endif  // MAPHEIGHTS_H
+#endif  // RESOURCES_MAP_MAPHEIGHTS_H
diff --git a/src/maplayer.cpp b/src/resources/map/maplayer.cpp
index 97ecc4f93..dae071565 100644
--- a/src/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "maplayer.h"
+#include "resources/map/maplayer.h"
 
 #include "configuration.h"
 #include "graphicsvertexes.h"
diff --git a/src/maplayer.h b/src/resources/map/maplayer.h
index 19b8f2503..2c3fc23f1 100644
--- a/src/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAPLAYER_H
-#define MAPLAYER_H
+#ifndef RESOURCES_MAP_MAPLAYER_H
+#define RESOURCES_MAP_MAPLAYER_H
 
 #include "position.h"
 #include "main.h"
@@ -325,4 +325,4 @@ class ObjectsLayer final
         unsigned mHeight;
 };
 
-#endif  // MAPLAYER_H
+#endif  // RESOURCES_MAP_MAPLAYER_H
diff --git a/src/properties.h b/src/resources/map/properties.h
index 5b9908746..7d3ff6ebf 100644
--- a/src/properties.h
+++ b/src/resources/map/properties.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PROPERTIES_H
-#define PROPERTIES_H
+#ifndef RESOURCES_MAP_PROPERTIES_H
+#define RESOURCES_MAP_PROPERTIES_H
 
 #include "localconsts.h"
 
@@ -132,4 +132,4 @@ class Properties
         PropertyMap mProperties;
 };
 
-#endif  // PROPERTIES_H
+#endif  // RESOURCES_MAP_PROPERTIES_H
diff --git a/src/tileset.h b/src/resources/map/tileset.h
index 05508658a..312896c62 100644
--- a/src/tileset.h
+++ b/src/resources/map/tileset.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TILESET_H
-#define TILESET_H
+#ifndef RESOURCES_MAP_TILESET_H
+#define RESOURCES_MAP_TILESET_H
 
 #include "resources/imageset.h"
 
@@ -76,4 +76,4 @@ class Tileset final : public ImageSet
         std::map<std::string, std::string> mProperties;
 };
 
-#endif  // TILESET_H
+#endif  // RESOURCES_MAP_TILESET_H
diff --git a/src/walklayer.cpp b/src/resources/map/walklayer.cpp
index 5ca6e4c71..88f2fe8ef 100644
--- a/src/walklayer.cpp
+++ b/src/resources/map/walklayer.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "walklayer.h"
+#include "resources/map/walklayer.h"
 
 #include "debug.h"
 
diff --git a/src/walklayer.h b/src/resources/map/walklayer.h
index 0c5110f48..a55cab434 100644
--- a/src/walklayer.h
+++ b/src/resources/map/walklayer.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WALKLAYER_H
-#define WALKLAYER_H
+#ifndef RESOURCES_MAP_WALKLAYER_H
+#define RESOURCES_MAP_WALKLAYER_H
 
 #include "resources/resource.h"
 
@@ -45,4 +45,4 @@ class WalkLayer final : public Resource
         int *mTiles;
 };
 
-#endif  // WALKLAYER_H
+#endif  // RESOURCES_MAP_WALKLAYER_H
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 44fc5f447..cf443ab16 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -26,8 +26,9 @@
 #include "graphicsmanager.h"
 #include "logger.h"
 #include "main.h"
-#include "map.h"
-#include "tileset.h"
+
+#include "resources/map/map.h"
+#include "resources/map/tileset.h"
 
 #include "resources/animation.h"
 #include "resources/beingcommon.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 27cbd665b..fac78de18 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -25,8 +25,8 @@
 
 #include "utils/xml.h"
 
-#include "mapheights.h"
-#include "maplayer.h"
+#include "resources/map/mapheights.h"
+#include "resources/map/maplayer.h"
 
 #include <string>
 
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 8ed5d52f1..9c6e3bbb6 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -26,7 +26,8 @@
 #include "configuration.h"
 #include "logger.h"
 #include "navigationmanager.h"
-#include "walklayer.h"
+
+#include "resources/map/walklayer.h"
 
 #include "resources/atlasmanager.h"
 #include "resources/dye.h"
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 5265a1a96..77561d11c 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -23,7 +23,8 @@
 #include "resources/spritedef.h"
 
 #include "logger.h"
-#include "map.h"
+
+#include "resources/map/map.h"
 
 #include "resources/action.h"
 #include "resources/animation.h"
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index b067a6de6..71832f559 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -23,7 +23,8 @@
 #include "simpleanimation.h"
 
 #include "logger.h"
-#include "map.h"
+
+#include "resources/map/map.h"
 
 #include "render/graphics.h"