summaryrefslogtreecommitdiff
path: root/src/resources/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-28 18:16:57 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-28 18:16:57 +0300
commit85f9c6a022a5a8c5b868fed9bd804811360d2e07 (patch)
tree6bc81873c809a2e580b33610f5d0cb07ac916a34 /src/resources/map
parentdd941148547c6813f8df17f452f32feee7e09f81 (diff)
downloadplus-85f9c6a022a5a8c5b868fed9bd804811360d2e07.tar.gz
plus-85f9c6a022a5a8c5b868fed9bd804811360d2e07.tar.bz2
plus-85f9c6a022a5a8c5b868fed9bd804811360d2e07.tar.xz
plus-85f9c6a022a5a8c5b868fed9bd804811360d2e07.zip
Join fs/virfs.h and fs/virtfs/virtfs.h
Diffstat (limited to 'src/resources/map')
-rw-r--r--src/resources/map/map.cpp3
-rw-r--r--src/resources/map/maplayer_unittest.cc2
-rw-r--r--src/resources/map/speciallayer_unittest.cc2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index b30892048..571b19abd 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -35,7 +35,8 @@
#include "enums/resources/map/mapitemtype.h"
#include "fs/mkdir.h"
-#include "fs/virtfs.h"
+
+#include "fs/virtfs/virtfs.h"
#include "gui/userpalette.h"
diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc
index 2bcbdbeae..945c52b0e 100644
--- a/src/resources/map/maplayer_unittest.cc
+++ b/src/resources/map/maplayer_unittest.cc
@@ -26,7 +26,7 @@
#include "enums/resources/map/blockmask.h"
#include "enums/resources/map/mapitemtype.h"
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
#include "gui/theme.h"
diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc
index 2e4e294c4..93270d7e5 100644
--- a/src/resources/map/speciallayer_unittest.cc
+++ b/src/resources/map/speciallayer_unittest.cc
@@ -28,7 +28,7 @@
#include "enums/resources/map/mapitemtype.h"
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
#include "utils/delete2.h"