summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-11 13:18:07 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-11 13:26:25 +0300
commitad42810bb9484f4930252ecc34b91d83f37e3293 (patch)
tree69f3bcf9b26bbdb08dde7e3a0fa6648fc432cf12 /src/gui/widgets
parent116349dac9b9d13d0e57e24e345590a8a0e70210 (diff)
downloadmanaverse-ad42810bb9484f4930252ecc34b91d83f37e3293.tar.gz
manaverse-ad42810bb9484f4930252ecc34b91d83f37e3293.tar.bz2
manaverse-ad42810bb9484f4930252ecc34b91d83f37e3293.tar.xz
manaverse-ad42810bb9484f4930252ecc34b91d83f37e3293.zip
Move map related files into resources/map.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/avatarlistbox.cpp3
-rw-r--r--src/gui/widgets/tabs/setup_audio.cpp3
-rw-r--r--src/gui/widgets/tabs/setup_other.cpp3
3 files changed, 6 insertions, 3 deletions
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"