summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-02 14:57:03 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-02 14:57:03 +0300
commit1abda37d9a6173f67ee12600ca8948cd205ebad1 (patch)
tree6a1374afd218cf2277e2a3f4bae0625cff5bddc7 /src/gui
parent3f022390bacc04946dcd7cfb2be5f23a78c49c83 (diff)
downloadmv-1abda37d9a6173f67ee12600ca8948cd205ebad1.tar.gz
mv-1abda37d9a6173f67ee12600ca8948cd205ebad1.tar.bz2
mv-1abda37d9a6173f67ee12600ca8948cd205ebad1.tar.xz
mv-1abda37d9a6173f67ee12600ca8948cd205ebad1.zip
Move mapitemtype into enums directory.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/popupmenu.cpp3
-rw-r--r--src/gui/viewport.cpp2
-rw-r--r--src/gui/widgets/avatarlistbox.cpp3
-rw-r--r--src/gui/widgets/tabs/socialtabbase.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 10b1db4ac..9adcc7b58 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -34,6 +34,8 @@
#include "being/playerrelation.h"
#include "being/playerrelations.h"
+#include "enums/resources/map/mapitemtype.h"
+
#include "input/inputmanager.h"
#include "gui/buttontext.h"
@@ -77,7 +79,6 @@
#include "resources/chatobject.h"
#include "resources/iteminfo.h"
-#include "resources/mapitemtype.h"
#include "resources/db/npcdb.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index ff7946ed6..caf55fcca 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -29,7 +29,7 @@
#include "sdlshared.h"
#include "textmanager.h"
-#include "resources/mapitemtype.h"
+#include "enums/resources/map/mapitemtype.h"
#include "resources/map/map.h"
#include "resources/map/mapitem.h"
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 47debb1e7..308de5746 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -27,6 +27,8 @@
#include "being/localplayer.h"
+#include "enums/resources/map/mapitemtype.h"
+
#include "gui/gui.h"
#include "gui/popupmanager.h"
#include "gui/skin.h"
@@ -41,7 +43,6 @@
#include "gui/windows/chatwindow.h"
#include "resources/image.h"
-#include "resources/mapitemtype.h"
#include "resources/map/map.h"
diff --git a/src/gui/widgets/tabs/socialtabbase.h b/src/gui/widgets/tabs/socialtabbase.h
index 24d11eaf1..98d2ddcb7 100644
--- a/src/gui/widgets/tabs/socialtabbase.h
+++ b/src/gui/widgets/tabs/socialtabbase.h
@@ -23,7 +23,7 @@
#include "actormanager.h"
-#include "resources/mapitemtype.h"
+#include "enums/resources/map/mapitemtype.h"
#define addAvatars(mob, str, type) \
{\