summaryrefslogtreecommitdiff
path: root/src/resources/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-21 17:08:42 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-21 17:16:24 +0300
commitfc60e6391b53c7e272bbbfe81e34f64ceb92fe06 (patch)
treec2010fe985e24cd4e22346a29856a6fd003775bc /src/resources/map
parent01ac8bad77156f50ba57ddff5306714dc3815ef3 (diff)
downloadmv-fc60e6391b53c7e272bbbfe81e34f64ceb92fe06.tar.gz
mv-fc60e6391b53c7e272bbbfe81e34f64ceb92fe06.tar.bz2
mv-fc60e6391b53c7e272bbbfe81e34f64ceb92fe06.tar.xz
mv-fc60e6391b53c7e272bbbfe81e34f64ceb92fe06.zip
Move virt fs related files into fs directory.
Diffstat (limited to 'src/resources/map')
-rw-r--r--src/resources/map/map.cpp19
-rw-r--r--src/resources/map/maplayer_unittest.cc3
-rw-r--r--src/resources/map/speciallayer_unittest.cc3
3 files changed, 14 insertions, 11 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index afc2bbffd..5af4e72f3 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -27,14 +27,6 @@
#include "notifymanager.h"
#include "settings.h"
-#include "resources/map/mapheights.h"
-#include "resources/map/maplayer.h"
-#include "resources/map/mapitem.h"
-#include "resources/map/objectslayer.h"
-#include "resources/map/speciallayer.h"
-#include "resources/map/tileset.h"
-#include "resources/map/walklayer.h"
-
#include "being/localplayer.h"
#include "enums/resources/notifytypes.h"
@@ -42,6 +34,8 @@
#include "enums/resources/map/blockmask.h"
#include "enums/resources/map/mapitemtype.h"
+#include "fs/virtfs.h"
+
#include "gui/userpalette.h"
#include "particle/particle.h"
@@ -53,8 +47,16 @@
#include "resources/loaders/imageloader.h"
#include "resources/map/location.h"
+#include "resources/map/mapheights.h"
#include "resources/map/mapobjectlist.h"
+#include "resources/map/maplayer.h"
+#include "resources/map/mapitem.h"
+#include "resources/map/objectslayer.h"
+#include "resources/map/speciallayer.h"
#include "resources/map/tileanimation.h"
+#include "resources/map/tileset.h"
+#include "resources/map/walklayer.h"
+
#ifdef USE_OPENGL
#include "render/renderers.h"
@@ -63,7 +65,6 @@
#include "utils/delete2.h"
#include "utils/dtor.h"
#include "utils/mkdir.h"
-#include "utils/virtfs.h"
#include "utils/timer.h"
#include <queue>
diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc
index f2efd49a6..34a0f128b 100644
--- a/src/resources/map/maplayer_unittest.cc
+++ b/src/resources/map/maplayer_unittest.cc
@@ -26,10 +26,11 @@
#include "enums/resources/map/blockmask.h"
#include "enums/resources/map/mapitemtype.h"
+#include "fs/virtfs.h"
+
#include "gui/theme.h"
#include "utils/delete2.h"
-#include "utils/virtfs.h"
#include "render/mockgraphics.h"
diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc
index 70f3d07e1..cf6c17120 100644
--- a/src/resources/map/speciallayer_unittest.cc
+++ b/src/resources/map/speciallayer_unittest.cc
@@ -28,8 +28,9 @@
#include "enums/resources/map/mapitemtype.h"
+#include "fs/virtfs.h"
+
#include "utils/delete2.h"
-#include "utils/virtfs.h"
#include "resources/sdlimagehelper.h"